xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backmerge tag 'v4.9-rc4' into drm-next

Browse Source 
Linux 4.9-rc4

This is needed for nouveau development.
This commit is contained in:
Dave Airlie
2016-11-07 09:37:09 +10:00
parent dc345c4677 bc33b0ca11
commit 7b624ad8fe
723 changed files with 8234 additions and 5471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/drm_atomic.c
View File

@@ -416,18 +416,21 @@ drm_atomic_replace_property_blob_from_id(struct drm_crtc *crtc,
ssize_t expected_size,
bool *replaced)
{
struct drm_device *dev = crtc->dev;
struct drm_property_blob *new_blob = NULL;
if (blob_id != 0) {
new_blob = drm_property_lookup_blob(dev, blob_id);
new_blob = drm_property_lookup_blob(crtc->dev, blob_id);
if (new_blob == NULL)
return -EINVAL;
if (expected_size > 0 && expected_size != new_blob->length)
if (expected_size > 0 && expected_size != new_blob->length) {
drm_property_unreference_blob(new_blob);
return -EINVAL;
}
}
drm_atomic_replace_property_blob(blob, new_blob, replaced);
drm_property_unreference_blob(new_blob);
return 0;
}