drm: Propagate error code from fb_create()
Change the interface to expect a PTR_ERR specifing the real error code as opposed to assuming a NULL return => -EINVAL. Just once the user may not be at fault! Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Родитель
0d18abedfa
Коммит
cce13ff759
|
@ -1682,9 +1682,9 @@ int drm_mode_addfb(struct drm_device *dev,
|
|||
/* TODO setup destructor callback */
|
||||
|
||||
fb = dev->mode_config.funcs->fb_create(dev, file_priv, r);
|
||||
if (!fb) {
|
||||
if (IS_ERR(fb)) {
|
||||
DRM_ERROR("could not create framebuffer\n");
|
||||
ret = -EINVAL;
|
||||
ret = PTR_ERR(fb);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
|
@ -5312,18 +5312,18 @@ intel_user_framebuffer_create(struct drm_device *dev,
|
|||
|
||||
obj = drm_gem_object_lookup(dev, filp, mode_cmd->handle);
|
||||
if (!obj)
|
||||
return NULL;
|
||||
return ERR_PTR(-ENOENT);
|
||||
|
||||
intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
|
||||
if (!intel_fb)
|
||||
return NULL;
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
ret = intel_framebuffer_init(dev, intel_fb,
|
||||
mode_cmd, obj);
|
||||
if (ret) {
|
||||
drm_gem_object_unreference_unlocked(obj);
|
||||
kfree(intel_fb);
|
||||
return NULL;
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
return &intel_fb->base;
|
||||
|
|
|
@ -119,7 +119,9 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
|
|||
|
||||
info->par = ifbdev;
|
||||
|
||||
intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, fbo);
|
||||
ret = intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, fbo);
|
||||
if (ret)
|
||||
goto out_unpin;
|
||||
|
||||
fb = &ifbdev->ifb.base;
|
||||
|
||||
|
|
|
@ -84,16 +84,16 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
|
|||
|
||||
gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle);
|
||||
if (!gem)
|
||||
return NULL;
|
||||
return ERR_PTR(-ENOENT);
|
||||
|
||||
nouveau_fb = kzalloc(sizeof(struct nouveau_framebuffer), GFP_KERNEL);
|
||||
if (!nouveau_fb)
|
||||
return NULL;
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
ret = nouveau_framebuffer_init(dev, nouveau_fb, mode_cmd, nouveau_gem_object(gem));
|
||||
if (ret) {
|
||||
drm_gem_object_unreference(gem);
|
||||
return NULL;
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
return &nouveau_fb->base;
|
||||
|
|
|
@ -888,13 +888,12 @@ radeon_user_framebuffer_create(struct drm_device *dev,
|
|||
if (obj == NULL) {
|
||||
dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
|
||||
"can't create framebuffer\n", mode_cmd->handle);
|
||||
return NULL;
|
||||
return ERR_PTR(-ENOENT);
|
||||
}
|
||||
|
||||
radeon_fb = kzalloc(sizeof(*radeon_fb), GFP_KERNEL);
|
||||
if (radeon_fb == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
if (radeon_fb == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
radeon_framebuffer_init(dev, radeon_fb, mode_cmd, obj);
|
||||
|
||||
|
|
|
@ -737,7 +737,7 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev,
|
|||
|
||||
if (ret) {
|
||||
DRM_ERROR("failed to create vmw_framebuffer: %i\n", ret);
|
||||
return NULL;
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
return &vfb->base;
|
||||
|
||||
|
@ -747,7 +747,7 @@ try_dmabuf:
|
|||
ret = vmw_user_dmabuf_lookup(tfile, mode_cmd->handle, &bo);
|
||||
if (ret) {
|
||||
DRM_ERROR("failed to find buffer: %i\n", ret);
|
||||
return NULL;
|
||||
return ERR_PTR(-ENOENT);
|
||||
}
|
||||
|
||||
ret = vmw_kms_new_framebuffer_dmabuf(dev_priv, bo, &vfb,
|
||||
|
@ -758,7 +758,7 @@ try_dmabuf:
|
|||
|
||||
if (ret) {
|
||||
DRM_ERROR("failed to create vmw_framebuffer: %i\n", ret);
|
||||
return NULL;
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
return &vfb->base;
|
||||
|
@ -768,7 +768,7 @@ err_not_scanout:
|
|||
/* vmw_user_surface_lookup takes one ref */
|
||||
vmw_surface_unreference(&surface);
|
||||
|
||||
return NULL;
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
static struct drm_mode_config_funcs vmw_kms_funcs = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче