diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2017-10-24 18:27:28 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-02 11:54:49 +0300 |
| commit | 0a2effa4941326d2d9e5d26fc70ebaa1a0e4eca5 (patch) | |
| tree | 8c1d545bf0d41a1e0b495ffed44ced74bd6944fd | |
| parent | 0d74253003e6370e65468f5aec8c969bdef6733e (diff) | |
| download | linux-0a2effa4941326d2d9e5d26fc70ebaa1a0e4eca5.tar.xz | |
drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace
commit 7277f755048da562eb2489becacd38d0d05e1e06 upstream.
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")
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 f33d90226704..1c3f92533778 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -2480,6 +2480,10 @@ static const struct file_operations fops = { .poll = i915_perf_poll, .read = i915_perf_read, .unlocked_ioctl = i915_perf_ioctl, + /* Our ioctl have no arguments, so it's safe to use the same function + * to handle 32bits compatibility. + */ + .compat_ioctl = i915_perf_ioctl, }; |