diff options
author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2017-10-24 11:27:28 -0400 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2017-10-25 11:16:13 -0400 |
commit | 7277f755048da562eb2489becacd38d0d05e1e06 (patch) | |
tree | 6269be64a239744b959ce95817beeefbaf679975 | |
parent | bb176f67090ca54869fc1262c913aa69d2ede070 (diff) |
drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace
The compat callback was missing and triggered failures in 32bits
userspace when enabling/disable the perf stream. We don't require any
particular processing here as these ioctls don't take any argument.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: eec688e1420 ("drm/i915: Add i915 perf infrastructure")
Cc: linux-stable <stable@vger.kernel.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171024152728.4873-1-lionel.g.landwerlin@intel.com
(cherry picked from commit 191f896085cf3b5d85920d58a759da4eea141721)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/i915_perf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 94185d610673..370b9d248fed 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c | |||
@@ -2537,6 +2537,10 @@ static const struct file_operations fops = { | |||
2537 | .poll = i915_perf_poll, | 2537 | .poll = i915_perf_poll, |
2538 | .read = i915_perf_read, | 2538 | .read = i915_perf_read, |
2539 | .unlocked_ioctl = i915_perf_ioctl, | 2539 | .unlocked_ioctl = i915_perf_ioctl, |
2540 | /* Our ioctl have no arguments, so it's safe to use the same function | ||
2541 | * to handle 32bits compatibility. | ||
2542 | */ | ||
2543 | .compat_ioctl = i915_perf_ioctl, | ||
2540 | }; | 2544 | }; |
2541 | 2545 | ||
2542 | 2546 | ||