All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH 1/6] drm/i915/selftests: Flush the context worker
@ 2019-12-30 16:01 Chris Wilson
  2019-12-30 16:01 ` [Intel-gfx] [PATCH 2/6] drm/i915/gt: Clear LRC image inline Chris Wilson
                   ` (6 more replies)
  0 siblings, 7 replies; 17+ messages in thread
From: Chris Wilson @ 2019-12-30 16:01 UTC (permalink / raw)
  To: intel-gfx; +Cc: matthew.auld

When cleaning up the mock device, remember to flush the context worker
to free the residual GEM contexts before shutting down the device.

Closes: https://gitlab.freedesktop.org/drm/intel/issues/802
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c                  | 4 ++--
 drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9ddcf17230e6..a3d701b50a6b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1172,6 +1172,8 @@ void i915_gem_driver_remove(struct drm_i915_private *dev_priv)
 
 void i915_gem_driver_release(struct drm_i915_private *dev_priv)
 {
+	i915_gem_driver_release__contexts(dev_priv);
+
 	intel_gt_driver_release(&dev_priv->gt);
 
 	intel_wa_list_free(&dev_priv->gt_wa_list);
@@ -1179,8 +1181,6 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv)
 	intel_uc_cleanup_firmwares(&dev_priv->gt.uc);
 	i915_gem_cleanup_userptr(dev_priv);
 
-	i915_gem_driver_release__contexts(dev_priv);
-
 	i915_gem_drain_freed_objects(dev_priv);
 
 	WARN_ON(!list_empty(&dev_priv->gem.contexts.list));
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 2b01094e4318..3b8986983afc 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -58,6 +58,8 @@ static void mock_device_release(struct drm_device *dev)
 	mock_device_flush(i915);
 	intel_gt_driver_remove(&i915->gt);
 
+	i915_gem_driver_release__contexts(i915);
+
 	i915_gem_drain_workqueue(i915);
 	i915_gem_drain_freed_objects(i915);
 
-- 
2.25.0.rc0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2019-12-30 17:08 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-30 16:01 [Intel-gfx] [PATCH 1/6] drm/i915/selftests: Flush the context worker Chris Wilson
2019-12-30 16:01 ` [Intel-gfx] [PATCH 2/6] drm/i915/gt: Clear LRC image inline Chris Wilson
2019-12-30 16:01 ` [Intel-gfx] [PATCH 3/6] drm/i915/gt: Leave RING_BB_STATE to default value Chris Wilson
2019-12-30 16:13   ` Chris Wilson
2019-12-30 16:18   ` Mika Kuoppala
2019-12-30 16:01 ` [Intel-gfx] [PATCH 4/6] drm/i915/gt: Ignore stale context state upon resume Chris Wilson
2019-12-30 16:14   ` Chris Wilson
2019-12-30 16:01 ` [Intel-gfx] [PATCH 5/6] drm/i915/gt: Discard stale context state from across idling Chris Wilson
2019-12-30 16:26   ` Chris Wilson
2019-12-30 16:30   ` Mika Kuoppala
2019-12-30 16:36     ` Chris Wilson
2019-12-30 16:01 ` [Intel-gfx] [PATCH 6/6] drm/i915/gt: Always poison the kernel_context image before unparking Chris Wilson
2019-12-30 16:23   ` Mika Kuoppala
2019-12-30 16:25     ` Chris Wilson
2019-12-30 16:03 ` [Intel-gfx] [PATCH 1/6] drm/i915/selftests: Flush the context worker Mika Kuoppala
2019-12-30 16:53 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/6] " Patchwork
2019-12-30 17:08   ` Chris Wilson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.