From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 5 Feb 2018 15:24:30 +0000
Subject: drm/i915/execlists: Move the reset bits to a more natural home
Git-commit: e840130a25a7fbe1520f32b6113e0fd68af0fb54
Patch-mainline: v4.17-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
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
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/i915/intel_lrc.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1467,6 +1467,9 @@ static void enable_execlists(struct inte
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)
@@ -1483,11 +1486,6 @@ static int gen8_init_common_ring(struct
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);
@@ -1533,6 +1531,8 @@ static void reset_irq(struct intel_engin
struct drm_i915_private *dev_priv = engine->i915;
int i;
+ GEM_BUG_ON(engine->id >= ARRAY_SIZE(gtiir));
+
/*
* Clear any pending interrupt state.
*
@@ -1581,6 +1581,9 @@ static void reset_common_ring(struct int
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