From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: stable@vger.kernel.org, Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [Intel-gfx] [PATCH 02/24] drm/i915/gt: Ignore repeated attempts to suspend request flow across reset
Date: Fri, 04 Dec 2020 17:03:57 +0200 [thread overview]
Message-ID: <877dpx395u.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20201204140315.24341-2-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Before reseting the engine, we suspend the execution of the guilty
> request, so that we can continue execution with a new context while we
> slowly compress the captured error state for the guilty context. However,
> if the reset fails, we will promptly attempt to reset the same request
> again, and discover the ongoing capture. Ignore the second attempt to
> suspend and capture the same request.
>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1168
> Fixes: 32ff621fd744 ("drm/i915/gt: Allow temporary suspension of inflight requests")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: <stable@vger.kernel.org> # v5.7+
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_lrc.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index 43703efb36d1..1d209a8a95e8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -2823,6 +2823,9 @@ static void __execlists_hold(struct i915_request *rq)
> static bool execlists_hold(struct intel_engine_cs *engine,
> struct i915_request *rq)
> {
> + if (i915_request_on_hold(rq))
> + return false;
> +
> spin_lock_irq(&engine->active.lock);
>
> if (i915_request_completed(rq)) { /* too late! */
> --
> 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 15:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 14:02 [Intel-gfx] [PATCH 01/24] drm/i915: Disable outputs during unregister Chris Wilson
2020-12-04 14:02 ` [Intel-gfx] [PATCH 02/24] drm/i915/gt: Ignore repeated attempts to suspend request flow across reset Chris Wilson
2020-12-04 15:03 ` Mika Kuoppala [this message]
2020-12-04 14:02 ` [Intel-gfx] [PATCH 03/24] drm/i915/gt: Cancel the preemption timeout on responding to it Chris Wilson
2020-12-04 15:04 ` Mika Kuoppala
2020-12-04 14:02 ` [Intel-gfx] [PATCH 04/24] drm/i915/gt: Include reset failures in the trace Chris Wilson
2020-12-04 14:02 ` [Intel-gfx] [PATCH 05/24] drm/i915/gt: Clear the execlists timers upon reset Chris Wilson
2020-12-04 14:02 ` [Intel-gfx] [PATCH 06/24] drm/i915/gt: Replace direct submit with direct call to tasklet Chris Wilson
2020-12-04 14:02 ` [Intel-gfx] [PATCH 07/24] drm/i915/gt: Use virtual_engine during execlists_dequeue Chris Wilson
2020-12-04 14:02 ` [Intel-gfx] [PATCH 08/24] drm/i915/gt: Decouple inflight virtual engines Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 09/24] drm/i915/gt: Defer schedule_out until after the next dequeue Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 10/24] drm/i915/gt: Remove virtual breadcrumb before transfer Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 11/24] drm/i915/gt: Shrink the critical section for irq signaling Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 12/24] drm/i915/gt: Resubmit the virtual engine on schedule-out Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 13/24] drm/i915/gt: Simplify virtual engine handling for execlists_hold() Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 14/24] drm/i915/gt: ce->inflight updates are now serialised Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 15/24] drm/i915/gem: Drop free_work for GEM contexts Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 16/24] drm/i915/gt: Track the overall awake/busy time Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 17/24] drm/i915: Encode fence specific waitqueue behaviour into the wait.flags Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 18/24] drm/i915/gt: Track all timelines created using the HWSP Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 19/24] drm/i915/gt: Wrap intel_timeline.has_initial_breadcrumb Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 20/24] drm/i915/gt: Track timeline GGTT offset separately from subpage offset Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 21/24] drm/i915/gt: Add timeline "mode" Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 22/24] drm/i915/gt: Use indices for writing into relative timelines Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 23/24] drm/i915/selftests: Exercise relative timeline modes Chris Wilson
2020-12-04 14:03 ` [Intel-gfx] [PATCH 24/24] drm/i915/gt: Use ppHWSP for unshared non-semaphore related timelines Chris Wilson
2020-12-04 15:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/24] drm/i915: Disable outputs during unregister Patchwork
2020-12-04 15:53 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-12-04 16:23 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " 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=877dpx395u.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=stable@vger.kernel.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