renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
Code

drm: Return error value from blob creation

Browse Source 
Change drm_property_create_blob to return an ERR_PTR-encoded error on
failure, so we can pass the failure reason down.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Cc: Maarten Lankhorst <maarten.lankhorst@intel.com>
Tested-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Stone 2015-05-22 13:34:50 +01:00 committed by Daniel Vetter
parent 99531d9bb7
commit 10e8cb7e79
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/drm_crtc.c
View File

@ -4154,6 +4154,10 @@ done:
* @dev: DRM device to create property for * @dev: DRM device to create property for
* @length: Length to allocate for blob data * @length: Length to allocate for blob data
* @data: If specified, copies data into blob * @data: If specified, copies data into blob
*
* Returns:
* New blob property with a single reference on success, or an ERR_PTR
* value on failure.
*/ */
struct drm_property_blob * struct drm_property_blob *
drm_property_create_blob(struct drm_device *dev, size_t length, drm_property_create_blob(struct drm_device *dev, size_t length,
@ -4163,11 +4167,11 @@ drm_property_create_blob(struct drm_device *dev, size_t length,
int ret; int ret;
if (!length) if (!length)
return NULL; return ERR_PTR(-EINVAL);
blob = kzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL); blob = kzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
if (!blob) if (!blob)
return NULL; return ERR_PTR(-ENOMEM);
blob->length = length; blob->length = length;
blob->dev = dev; blob->dev = dev;
@ -4181,7 +4185,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length,
if (ret) { if (ret) {
kfree(blob); kfree(blob);
mutex_unlock(&dev->mode_config.blob_lock); mutex_unlock(&dev->mode_config.blob_lock);
return NULL; return ERR_PTR(-EINVAL);
} }
kref_init(&blob->refcount); kref_init(&blob->refcount);
@ -4370,8 +4374,8 @@ static int drm_property_replace_global_blob(struct drm_device *dev,
if (length && data) { if (length && data) {
new_blob = drm_property_create_blob(dev, length, data); new_blob = drm_property_create_blob(dev, length, data);
if (!new_blob) if (IS_ERR(new_blob))
return -EINVAL; return PTR_ERR(new_blob);
} }
/* This does not need to be synchronised with blob_lock, as the /* This does not need to be synchronised with blob_lock, as the