Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/i915/selftests: Mark contexts as lost during freeing of mock device

We need to unpin the last retired context early in the shutdown sequence
so that its RCU free is done before we try to free the context ida. I
included this in a later patch ("drm/i915: Keep a recent cache of freed
contexts objects for reuse") and so missed that the selftests were broken
in the meantime.

Reported-by: Matthew Auld <matthew.auld@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101627
Fixes: 5f09a9c8ab6b ("drm/i915: Allow contexts to be unreferenced locklessly")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170719135957.14603-1-chris@chris-wilson.co.uk
Tested-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Chris Wilson 8 years ago
parent
99c539bef5
commit
56d27666f8
1 changed files with 1 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      drivers/gpu/drm/i915/selftests/mock_gem_device.c

+ 1 - 0
drivers/gpu/drm/i915/selftests/mock_gem_device.c
View File 

@@ -54,6 +54,7 @@ static void mock_device_release(struct drm_device *dev)
 
 
 
 	mutex_lock(&i915->drm.struct_mutex);
 
 	mutex_lock(&i915->drm.struct_mutex);
 
 	mock_device_flush(i915);
 
 	mock_device_flush(i915);
 
+	i915_gem_contexts_lost(i915);
 
 	mutex_unlock(&i915->drm.struct_mutex);
 
 	mutex_unlock(&i915->drm.struct_mutex);
 
 
 
 	cancel_delayed_work_sync(&i915->gt.retire_work);
 
 	cancel_delayed_work_sync(&i915->gt.retire_work);