[PATCH 4/4] reset-irq2

[Chris Wilson]

---
 drivers/gpu/drm/i915/intel_lrc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 066bc25821ba..e0534a3138c5 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1495,6 +1495,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *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 */
@@ -1557,7 +1558,6 @@ static void reset_common_ring(struct intel_engine_cs *engine,
 	I915_WRITE(GEN8_GT_IIR(gtiir[engine->id]),
 		   GT_CONTEXT_SWITCH_INTERRUPT << engine->irq_shift);
 	clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
-	execlists->csb_head = -1;
 
 	spin_lock_irqsave(&engine->timeline->lock, flags);
 
-- 
2.15.1