diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-26 10:25:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-26 10:25:31 +1000 |
| commit | 522dbb354e8b6149d69244b4cf745a3222ddbb05 (patch) | |
| tree | 3716af258c1f45662d16d660a7433b9dfbc7721c /drivers | |
| parent | 5a28747b4a74aebadde81044241a704c0c40893a (diff) | |
| parent | 7277f755048da562eb2489becacd38d0d05e1e06 (diff) | |
| download | linux-522dbb354e8b6149d69244b4cf745a3222ddbb05.tar.bz2 | |
Merge tag 'drm-intel-fixes-2017-10-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
drm-intel-fixes-2017-10-25:
only 1 fix for stable:
- fix perf enable/disable ioctls for 32bits (lionel)
* tag 'drm-intel-fixes-2017-10-25' of git://anongit.freedesktop.org/drm/drm-intel:
drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace
Diffstat (limited to 'drivers')
| -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 = { .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, }; |