From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v2] drm/i915: Actually flush interrupts on reset not just wedging
Date: Fri, 23 Mar 2018 12:53:00 +0200 [thread overview]
Message-ID: <87y3ij3vxv.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20180323101824.14645-1-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Commit 0f36a85c3bd5 ("drm/i915: Flush pending interrupt following a GPU
> reset") got confused and only applied the flush to the set-wedge path
> (which itself is proving troublesome), but we also need the
> serialisation on the regular reset path. Oops.
>
> Move the interrupt into reset_irq() and make it common to the reset and
> final set-wedge.
>
> v2: reset_irq() after port cancellation, as we assert that
> execlists->active is sane for cancellation (and is being reset by
> reset_irq).
>
> References: 0f36a85c3bd5 ("drm/i915: Flush pending interrupt following a GPU reset")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Cc: Michel Thierry <michel.thierry@intel.com>
> Cc: Michał Winiarski <michal.winiarski@intel.com>
> Cc: Jeff McGee <jeff.mcgee@intel.com>
> ---
> drivers/gpu/drm/i915/intel_lrc.c | 107 +++++++++++++++++++--------------------
> 1 file changed, 53 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index ce09c5ad334f..b4ab06b05e58 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -740,6 +740,57 @@ execlists_cancel_port_requests(struct intel_engine_execlists * const execlists)
> }
> }
>
> +static void clear_gtiir(struct intel_engine_cs *engine)
> +{
> + static const u8 gtiir[] = {
> + [RCS] = 0,
> + [BCS] = 0,
> + [VCS] = 1,
> + [VCS2] = 1,
> + [VECS] = 3,
> + };
> + struct drm_i915_private *dev_priv = engine->i915;
> + int i;
> +
> + /* TODO: correctly reset irqs for gen11 */
> + if (WARN_ON_ONCE(INTEL_GEN(engine->i915) >= 11))
> + return;
> +
> + GEM_BUG_ON(engine->id >= ARRAY_SIZE(gtiir));
> +
> + /*
> + * Clear any pending interrupt state.
> + *
> + * We do it twice out of paranoia that some of the IIR are
> + * double buffered, and so if we only reset it once there may
> + * still be an interrupt pending.
> + */
> + for (i = 0; i < 2; i++) {
> + I915_WRITE(GEN8_GT_IIR(gtiir[engine->id]),
> + engine->irq_keep_mask);
> + POSTING_READ(GEN8_GT_IIR(gtiir[engine->id]));
> + }
> + GEM_BUG_ON(I915_READ(GEN8_GT_IIR(gtiir[engine->id])) &
> + engine->irq_keep_mask);
> +}
> +
> +static void reset_irq(struct intel_engine_cs *engine)
> +{
> + /* Mark all CS interrupts as complete */
> + smp_store_mb(engine->execlists.active, 0);
> + synchronize_hardirq(engine->i915->drm.irq);
> +
> + clear_gtiir(engine);
Should clearing the iir be before we synchronize?
Our master irq is off, so no bit can light up,
clear iir, prevent tasklet with active and synchronize.
For documentation it would be nice that we have
assert that the tasklet is indeed disabled.
-Mika
> +
> + /*
> + * The port is checked prior to scheduling a tasklet, but
> + * just in case we have suspended the tasklet to do the
> + * wedging make sure that when it wakes, it decides there
> + * is no work to do by clearing the irq_posted bit.
> + */
> + clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
> +}
> +
> static void execlists_cancel_requests(struct intel_engine_cs *engine)
> {
> struct intel_engine_execlists * const execlists = &engine->execlists;
> @@ -767,6 +818,7 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)
>
> /* Cancel the requests on the HW and clear the ELSP tracker. */
> execlists_cancel_port_requests(execlists);
> + reset_irq(engine);
>
> spin_lock(&engine->timeline->lock);
>
> @@ -805,18 +857,6 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)
>
> spin_unlock(&engine->timeline->lock);
>
> - /* Mark all CS interrupts as complete */
> - smp_store_mb(execlists->active, 0);
> - synchronize_hardirq(engine->i915->drm.irq);
> -
> - /*
> - * The port is checked prior to scheduling a tasklet, but
> - * just in case we have suspended the tasklet to do the
> - * wedging make sure that when it wakes, it decides there
> - * is no work to do by clearing the irq_posted bit.
> - */
> - clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
> -
> local_irq_restore(flags);
> }
>
> @@ -1566,14 +1606,6 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
> return ret;
> }
>
> -static u8 gtiir[] = {
> - [RCS] = 0,
> - [BCS] = 0,
> - [VCS] = 1,
> - [VCS2] = 1,
> - [VECS] = 3,
> -};
> -
> static void enable_execlists(struct intel_engine_cs *engine)
> {
> struct drm_i915_private *dev_priv = engine->i915;
> @@ -1657,35 +1689,6 @@ static int gen9_init_render_ring(struct intel_engine_cs *engine)
> return init_workarounds_ring(engine);
> }
>
> -static void reset_irq(struct intel_engine_cs *engine)
> -{
> - struct drm_i915_private *dev_priv = engine->i915;
> - int i;
> -
> - /* TODO: correctly reset irqs for gen11 */
> - if (WARN_ON_ONCE(INTEL_GEN(engine->i915) >= 11))
> - return;
> -
> - GEM_BUG_ON(engine->id >= ARRAY_SIZE(gtiir));
> -
> - /*
> - * Clear any pending interrupt state.
> - *
> - * We do it twice out of paranoia that some of the IIR are double
> - * buffered, and if we only reset it once there may still be
> - * an interrupt pending.
> - */
> - for (i = 0; i < 2; i++) {
> - I915_WRITE(GEN8_GT_IIR(gtiir[engine->id]),
> - engine->irq_keep_mask);
> - POSTING_READ(GEN8_GT_IIR(gtiir[engine->id]));
> - }
> - GEM_BUG_ON(I915_READ(GEN8_GT_IIR(gtiir[engine->id])) &
> - engine->irq_keep_mask);
> -
> - clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
> -}
> -
> static void reset_common_ring(struct intel_engine_cs *engine,
> struct i915_request *request)
> {
> @@ -1699,8 +1702,6 @@ static void reset_common_ring(struct intel_engine_cs *engine,
> /* See execlists_cancel_requests() for the irq/spinlock split. */
> local_irq_save(flags);
>
> - reset_irq(engine);
> -
> /*
> * Catch up with any missed context-switch interrupts.
> *
> @@ -1711,15 +1712,13 @@ static void reset_common_ring(struct intel_engine_cs *engine,
> * requests were completed.
> */
> execlists_cancel_port_requests(execlists);
> + reset_irq(engine);
>
> /* Push back any incomplete requests for replay after the reset. */
> spin_lock(&engine->timeline->lock);
> __unwind_incomplete_requests(engine);
> spin_unlock(&engine->timeline->lock);
>
> - /* Mark all CS interrupts as complete */
> - execlists->active = 0;
> -
> local_irq_restore(flags);
>
> /*
> --
> 2.16.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-03-23 10:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 9:08 [PATCH] drm/i915: Actually flush interrupts on reset not just wedging Chris Wilson
2018-03-23 9:55 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2018-03-23 10:10 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-03-23 10:18 ` [PATCH v2] " Chris Wilson
2018-03-23 10:53 ` Mika Kuoppala [this message]
2018-03-23 11:01 ` Chris Wilson
2018-03-23 12:37 ` Mika Kuoppala
2018-03-23 11:41 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Actually flush interrupts on reset not just wedging (rev2) Patchwork
2018-03-23 11:56 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-03-23 12:06 ` Chris Wilson
2018-03-23 14:59 ` ✗ Fi.CI.CHECKPATCH: warning " Patchwork
2018-03-23 15:14 ` ✓ Fi.CI.BAT: success " Patchwork
2018-03-23 16:59 ` ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y3ij3vxv.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox