diff options
| author |   Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2015-07-13 16:51:39 +0100 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-14 10:15:41 +0200 |
| commit | ac7e7ab1c3243b10b41653cc8d8536088d83b152 (patch) | |
| tree | 81b9e3428d02d3e470e0e8e0e0b7a1c16a1e5527 /drivers/gpu/drm/i915/i915_ioc32.c | |
| parent | drm/i915: fix oops in primary_check_plane (diff) | |
| download | wireguard-linux-ac7e7ab1c3243b10b41653cc8d8536088d83b152.tar.xz wireguard-linux-ac7e7ab1c3243b10b41653cc8d8536088d83b152.zip | |
drm/i915: Forward all core DRM ioctls to core compat handling
Previously only core DRM ioctls under the DRM_COMMAND_BASE were being
forwarded, but the drm.h header suggests (and reality confirms) ones
after (and including) DRM_COMMAND_END should be forwarded as well.
We need this to correctly forward the compat ioctl for the botched-up
addfb2.1 extension.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: stable@vger.kernel.org # 4.1+
[danvet: Explain why this is suddenly needed and add cc: stable.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_ioc32.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_ioc32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c index 176de6322e4d..23aa04cded6b 100644 --- a/drivers/gpu/drm/i915/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c @@ -204,7 +204,7 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) drm_ioctl_compat_t *fn = NULL; int ret; - if (nr < DRM_COMMAND_BASE) + if (nr < DRM_COMMAND_BASE || nr >= DRM_COMMAND_END) return drm_compat_ioctl(filp, cmd, arg); if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) |