diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-09-19 17:16:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-09-19 17:16:02 +1000 |
| commit | 9f8cf165c62913244479832f04c44cd77ffc9293 (patch) | |
| tree | 7d36f015040f39837a7a0f32c1f0853f33405c44 /drivers/gpu/drm/drm_atomic.c | |
| parent | 8506912b969b60aacc733315eeeb46b014d920a4 (diff) | |
| parent | a988588b1806b40ae115fe1c9ab38706fd1a7c2b (diff) | |
| download | kernel_replicant_linux-9f8cf165c62913244479832f04c44cd77ffc9293.tar.gz kernel_replicant_linux-9f8cf165c62913244479832f04c44cd77ffc9293.tar.bz2 kernel_replicant_linux-9f8cf165c62913244479832f04c44cd77ffc9293.zip | |
Merge tag 'topic/drm-misc-2016-09-19' of git://anongit.freedesktop.org/drm-intel into drm-next
Just random misc stuff that Sean/Sumit&Archit picked up while I relaxed.
Well except for one commit:
* tag 'topic/drm-misc-2016-09-19' of git://anongit.freedesktop.org/drm-intel:
drm: Only use compat ioctl for addfb2 on X86/IA64
drm/qxl: squash lines for simple wrapper functions
drm/bridge: analogix_dp: squash lines for simple wrapper functions
drm/radeon: squash lines for simple wrapper functions
drm/amdgpu: squash lines for simple wrapper functions
dma-buf/sync-file: Avoid enable fence signaling if poll(.timeout=0)
drm/fence: allow fence waiting to be interrupted by userspace
drm: Move property validation to a helper, v2.
drm/bridge: adv7511: add support for the 2nd chip
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index a5126e5c05ee..904d29c012ad 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1609,7 +1609,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, struct drm_crtc_state *crtc_state; unsigned plane_mask; int ret = 0; - unsigned int i, j, k; + unsigned int i, j; /* disallow for drivers not supporting atomic: */ if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) @@ -1691,16 +1691,7 @@ retry: goto out; } - for (k = 0; k < obj->properties->count; k++) - if (obj->properties->properties[k]->base.id == prop_id) - break; - - if (k == obj->properties->count) { - ret = -EINVAL; - goto out; - } - - prop = drm_property_find(dev, prop_id); + prop = drm_mode_obj_find_prop_id(obj, prop_id); if (!prop) { drm_mode_object_unreference(obj); ret = -ENOENT; |