]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/selftests: Mark contexts as lost during freeing of mock device
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 19 Jul 2017 13:59:57 +0000 (14:59 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 19 Jul 2017 18:15:12 +0000 (19:15 +0100)
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>
drivers/gpu/drm/i915/selftests/mock_gem_device.c

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