summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/selftests
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2019-03-18 21:23:46 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2019-03-19 08:21:11 +0000
commit206c2f812fee530f7eda8ad0e97126aec3cd7c43 (patch)
treea0b2f3457f4c0681c692a0420477e219e1b77f39 /drivers/gpu/drm/i915/selftests
parent73e97d43666a0a67a2cbeed7b3ce38abdc7cf873 (diff)
downloadlinux-stable-206c2f812fee530f7eda8ad0e97126aec3cd7c43.tar.gz
linux-stable-206c2f812fee530f7eda8ad0e97126aec3cd7c43.tar.bz2
linux-stable-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/selftests')
-rw-r--r--drivers/gpu/drm/i915/selftests/mock_engine.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c
index 881450c694e9..7641b74ada98 100644
--- a/drivers/gpu/drm/i915/selftests/mock_engine.c
+++ b/drivers/gpu/drm/i915/selftests/mock_engine.c
@@ -126,8 +126,6 @@ static void hw_delay_complete(struct timer_list *t)
static void mock_context_unpin(struct intel_context *ce)
{
mock_timeline_unpin(ce->ring->timeline);
- list_del(&ce->active_link);
- i915_gem_context_put(ce->gem_context);
}
static void mock_context_destroy(struct intel_context *ce)