diff options
author | Chris Wilson | 2016-09-09 15:11:50 +0200 |
---|---|---|
committer | Chris Wilson | 2016-09-09 15:23:03 +0200 |
commit | 22dd3bb9190566c7c3b80edb7dea67d1e21d0f91 (patch) | |
tree | 01898a53077a19a7c4608716a7c638924bc0992b /drivers/gpu/drm/i915/i915_debugfs.c | |
parent | drm/i915: Expand bool interruptible to pass flags to i915_wait_request() (diff) | |
download | kernel-qcow2-linux-22dd3bb9190566c7c3b80edb7dea67d1e21d0f91.tar.gz kernel-qcow2-linux-22dd3bb9190566c7c3b80edb7dea67d1e21d0f91.tar.xz kernel-qcow2-linux-22dd3bb9190566c7c3b80edb7dea67d1e21d0f91.zip |
drm/i915: Mark up all locked waiters
In the next patch we want to handle reset directly by a locked waiter in
order to avoid issues with returning before the reset is handled. To
handle the reset, we must first know whether we hold the struct_mutex.
If we do not hold the struct_mtuex we can not perform the reset, but we do
not block the reset worker either (and so we can just continue to wait for
request completion) - otherwise we must relinquish the mutex.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160909131201.16673-10-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 0e4cbad7a883..6a270bc0fdb3 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -4794,7 +4794,9 @@ i915_drop_caches_set(void *data, u64 val) return ret; if (val & DROP_ACTIVE) { - ret = i915_gem_wait_for_idle(dev_priv, I915_WAIT_INTERRUPTIBLE); + ret = i915_gem_wait_for_idle(dev_priv, + I915_WAIT_INTERRUPTIBLE | + I915_WAIT_LOCKED); if (ret) goto unlock; } |