diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-03-18 22:23:46 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-03-19 09:21:11 +0100 |
| commit | 206c2f812fee530f7eda8ad0e97126aec3cd7c43 (patch) | |
| tree | a0b2f3457f4c0681c692a0420477e219e1b77f39 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | drm/i915/psr: remove drmP.h include that crept in (diff) | |
| download | linux-206c2f812fee530f7eda8ad0e97126aec3cd7c43.tar.xz linux-206c2f812fee530f7eda8ad0e97126aec3cd7c43.zip | |
drm/i915: Lock the gem_context->active_list while dropping the link
On unpinning the intel_context, we remove it from the active list
inside the GEM context. This list is supposed to be guarded by the GEM
context mutex, so remember to take it!
Fixes: 7e3d9a59410d ("drm/i915: Track active engines within a context")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190318212347.30146-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 5137f0140664..81b32bac2bcd 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1430,9 +1430,6 @@ static void ring_context_unpin(struct intel_context *ce) { __context_unpin_ppgtt(ce->gem_context); __context_unpin(ce); - - list_del(&ce->active_link); - i915_gem_context_put(ce->gem_context); } static struct i915_vma * |