[Intel-gfx] [PATCH 1/5] drm/i915/execlists: Flush the tasklet on parking

[Chris Wilson]

Tidy up the cleanup sequence by always ensure that the tasklet is
flushed on parking (before we cleanup). The parking provides a
convenient point to ensure that the backend is truly idle.

Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gt/intel_lrc.c         | 25 +++++++--------------
 drivers/gpu/drm/i915/intel_guc_submission.c |  1 +
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c 
b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 01f58a152a9e..ea7794d368d1 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -2331,27 +2331,18 @@ static int gen8_init_rcs_context(struct i915_request 
*rq)
        return i915_gem_render_state_emit(rq);
 }
 
+static void execlists_park(struct intel_engine_cs *engine)
+{
+       tasklet_kill(&engine->execlists.tasklet);
+}
+
 /**
  * intel_logical_ring_cleanup() - deallocate the Engine Command Streamer
  * @engine: Engine Command Streamer.
  */
 void intel_logical_ring_cleanup(struct intel_engine_cs *engine)
 {
-       struct drm_i915_private *dev_priv;
-
-       /*
-        * Tasklet cannot be active at this point due intel_mark_active/idle
-        * so this is just for documentation.
-        */
-       if (WARN_ON(test_bit(TASKLET_STATE_SCHED,
-                            &engine->execlists.tasklet.state)))
-               tasklet_kill(&engine->execlists.tasklet);
-
-       dev_priv = engine->i915;
-
-       if (engine->buffer) {
-               WARN_ON((ENGINE_READ(engine, RING_MI_MODE) & MODE_IDLE) == 0);
-       }
+       struct drm_i915_private *i915 = engine->i915;
 
        if (engine->cleanup)
                engine->cleanup(engine);
@@ -2361,7 +2352,7 @@ void intel_logical_ring_cleanup(struct intel_engine_cs 
*engine)
        lrc_destroy_wa_ctx(engine);
 
        engine->i915 = NULL;
-       dev_priv->engine[engine->id] = NULL;
+       i915->engine[engine->id] = NULL;
        kfree(engine);
 }
 
@@ -2376,7 +2367,7 @@ void intel_execlists_set_default_submission(struct 
intel_engine_cs *engine)
        engine->reset.reset = execlists_reset;
        engine->reset.finish = execlists_reset_finish;
 
-       engine->park = NULL;
+       engine->park = execlists_park;
        engine->unpark = NULL;
 
        engine->flags |= I915_ENGINE_SUPPORTS_STATS;
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c 
b/drivers/gpu/drm/i915/intel_guc_submission.c
index 4c814344809c..ed94001028f2 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -1363,6 +1363,7 @@ static void guc_interrupts_release(struct 
drm_i915_private *dev_priv)
 
 static void guc_submission_park(struct intel_engine_cs *engine)
 {
+       tasklet_kill(&engine->execlists.tasklet);
        intel_engine_unpin_breadcrumbs_irq(engine);
        engine->flags &= ~I915_ENGINE_NEEDS_BREADCRUMB_TASKLET;
 }
-- 
2.20.1

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