From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [Intel-gfx] [PATCH 4/4] drm/i915/gt: Clear the execlists timers upon reset
Date: Fri, 04 Dec 2020 15:58:42 +0200 [thread overview]
Message-ID: <87czzp3c6l.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20201203081616.1645-4-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Across a reset, we stop the engine but not the timers. This leaves a
> window where the timers have inconsistent state with the engine, but
> should only result in a spurious timeout. As we cancel the outstanding
> events, also cancel their timers.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_lrc.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 7f25894e41d5..0c7f1e3dee5c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -2450,6 +2450,11 @@ cancel_port_requests(struct intel_engine_execlists * const execlists)
>
> smp_wmb(); /* complete the seqlock for execlists_active() */
> WRITE_ONCE(execlists->active, execlists->inflight);
> +
> + /* Having cancelled all outstanding process_csb(), stop their timers */
> + GEM_BUG_ON(execlists->pending[0]);
> + cancel_timer(&execlists->timer);
> + cancel_timer(&execlists->preempt);
> }
>
> static inline void
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-12-04 14:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 8:16 [Intel-gfx] [PATCH 1/4] drm/i915/gt: Ignore repeated attempts to suspend request flow across reset Chris Wilson
2020-12-03 8:16 ` [Intel-gfx] [PATCH 2/4] drm/i915/gt: Cancel the preemption timeout on responding to it Chris Wilson
2020-12-03 8:16 ` [Intel-gfx] [PATCH 3/4] drm/i915/gt: Include reset failures in the trace Chris Wilson
2020-12-04 13:59 ` Mika Kuoppala
2020-12-03 8:16 ` [Intel-gfx] [PATCH 4/4] drm/i915/gt: Clear the execlists timers upon reset Chris Wilson
2020-12-04 13:58 ` Mika Kuoppala [this message]
2020-12-03 8:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/gt: Ignore repeated attempts to suspend request flow across reset Patchwork
2020-12-03 8:28 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-12-03 8:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-12-03 11:21 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-12-03 13:49 ` [Intel-gfx] [PATCH 1/4] " Chris Wilson
2020-12-03 13:50 ` Chris Wilson
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=87czzp3c6l.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