Commit 274de876 authored by Chris Wilson's avatar Chris Wilson

drm/i915/execlists: Flush GTIIR on clearing CS interrupts during reset

Be paranoid and flush the GTIIR after clearing the CS interrupt to be
sure it has taken before we re-enable the interrupt handler. We still
see early interrupts following reset, the tasklet handling the mmio read
before it has been written by the CS. This hopefully reduces the
frequency to 0...

References: https://bugs.freedesktop.org/show_bug.cgi?id=104262Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarMichel Thierry <michel.thierry@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180202145455.29876-1-chris@chris-wilson.co.uk
parent d67c0ac1
...@@ -1527,6 +1527,7 @@ static int gen9_init_render_ring(struct intel_engine_cs *engine) ...@@ -1527,6 +1527,7 @@ static int gen9_init_render_ring(struct intel_engine_cs *engine)
static void reset_irq(struct intel_engine_cs *engine) static void reset_irq(struct intel_engine_cs *engine)
{ {
struct drm_i915_private *dev_priv = engine->i915; struct drm_i915_private *dev_priv = engine->i915;
int i;
/* /*
* Clear any pending interrupt state. * Clear any pending interrupt state.
...@@ -1535,10 +1536,14 @@ static void reset_irq(struct intel_engine_cs *engine) ...@@ -1535,10 +1536,14 @@ static void reset_irq(struct intel_engine_cs *engine)
* buffered, and if we only reset it once there may still be * buffered, and if we only reset it once there may still be
* an interrupt pending. * an interrupt pending.
*/ */
I915_WRITE(GEN8_GT_IIR(gtiir[engine->id]), for (i = 0; i < 2; i++) {
GT_CONTEXT_SWITCH_INTERRUPT << engine->irq_shift); I915_WRITE(GEN8_GT_IIR(gtiir[engine->id]),
I915_WRITE(GEN8_GT_IIR(gtiir[engine->id]), GT_CONTEXT_SWITCH_INTERRUPT << engine->irq_shift);
GT_CONTEXT_SWITCH_INTERRUPT << engine->irq_shift); POSTING_READ(GEN8_GT_IIR(gtiir[engine->id]));
}
GEM_BUG_ON(I915_READ(GEN8_GT_IIR(gtiir[engine->id])) &
(GT_CONTEXT_SWITCH_INTERRUPT << engine->irq_shift));
clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted); clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment