drm/i915/execlists: Move the reset bits to a more natural home

In preparation for the next patch, we want the engine to appear idle
after a reset (if there are no requests in flight). For execlists, this
entails clearing the active status on reset, it will be regenerated on
restarting the engine after the reset. In the process, note that a
couple of other status flags and checks could be moved into the
describing function.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180205152431.12163-3-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index afc41dbc872e55c8d20af6ede203b945688dc9a5..adf257dfa5e0b55c83e9d2d8fd19df9b3db54ed8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1462,6 +1462,9 @@ static void enable_execlists(struct intel_engine_cs *engine)
        I915_WRITE(RING_HWS_PGA(engine->mmio_base),
                   engine->status_page.ggtt_offset);
        POSTING_READ(RING_HWS_PGA(engine->mmio_base));
+
+       /* Following the reset, we need to reload the CSB read/write pointers */
+       engine->execlists.csb_head = -1;
 }
 
 static int gen8_init_common_ring(struct intel_engine_cs *engine)
@@ -1478,11 +1481,6 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine)
 
        enable_execlists(engine);
 
-       GEM_BUG_ON(engine->id >= ARRAY_SIZE(gtiir));
-
-       execlists->csb_head = -1;
-       execlists->active = 0;
-
        /* After a GPU reset, we may have requests to replay */
        if (execlists->first)
                tasklet_schedule(&execlists->tasklet);
@@ -1528,6 +1526,8 @@ static void reset_irq(struct intel_engine_cs *engine)
        struct drm_i915_private *dev_priv = engine->i915;
        int i;
 
+       GEM_BUG_ON(engine->id >= ARRAY_SIZE(gtiir));
+
        /*
         * Clear any pending interrupt state.
         *
@@ -1576,6 +1576,9 @@ static void reset_common_ring(struct intel_engine_cs *engine,
 
        spin_unlock_irqrestore(&engine->timeline->lock, flags);
 
+       /* Mark all CS interrupts as complete */
+       execlists->active = 0;
+
        /* If the request was innocent, we leave the request in the ELSP
         * and will try to replay it on restarting. The context image may
         * have been corrupted by the reset, in which case we may have