diff options
| author |  Chris Wilson <chris@chris-wilson.co.uk>
| 2016-05-13 11:57:20 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk>
| 2016-05-13 12:38:52 +0100 |
| commit | bdb04614d8461c781801afe074b1a1c766135c30 (patch) | |
| tree | e6329d7c650581ecee4a9c89ef26908ce857123a /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | drm/i915: Move get-reset-stats ioctl from intel_uncore.c to i915_gem_context.c (diff) | |
| download | linux-bdb04614d8461c781801afe074b1a1c766135c30.tar.gz linux-bdb04614d8461c781801afe074b1a1c766135c30.tar.bz2 linux-bdb04614d8461c781801afe074b1a1c766135c30.zip | |
drm/i915: Complete pending resets before get-reset-stats ioctl
The get-reset-stats ioctls wasn't waiting for a pending reset before
reporting its statistics, and so was ignoring a hang generated by the
context that should have been reported against said context.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-2-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index f3c76ca6b411..2aedd188473d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -1056,7 +1056,7 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev, if (args->ctx_id == DEFAULT_CONTEXT_HANDLE && !capable(CAP_SYS_ADMIN)) return -EPERM; - ret = mutex_lock_interruptible(&dev->struct_mutex); + ret = i915_mutex_lock_interruptible(dev); if (ret) return ret; |