From: John Harrison <john.c.harrison@intel.com>
To: <Intel-GFX@Lists.FreeDesktop.Org>
Cc: Matthew Brost <matthew.brost@intel.com>, DRI-Devel@Lists.FreeDesktop.Org
Subject: Re: [PATCH 2/6] drm/i915/guc: Fix issues with live_preempt_cancel
Date: Wed, 27 Jul 2022 19:45:21 -0700 [thread overview]
Message-ID: <ddcd8ff4-4439-a560-9901-51120e603da6@intel.com> (raw)
In-Reply-To: <20220728024225.2363663-3-John.C.Harrison@Intel.com>
On 7/27/2022 19:42, John.C.Harrison@Intel.com wrote:
> From: Matthew Brost <matthew.brost@intel.com>
>
> Having semaphores results in different behavior when a dependent request
> is cancelled. In the case of semaphores the request could be on the HW
> and complete successfully while without the request is held in the
> driver and the error from the dependent request is propagated. Fix
> live_preempt_cancel to take this behavior into account.
>
> Also update live_preempt_cancel to use new function intel_context_ban
> rather than intel_context_set_banned.
>
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/gt/selftest_execlists.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c
> index 02fc97a0ab502..015f8cd3463e2 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c
> @@ -2087,7 +2087,7 @@ static int __cancel_active0(struct live_preempt_cancel *arg)
> goto out;
> }
>
> - intel_context_set_banned(rq->context);
> + intel_context_ban(rq->context, rq);
> err = intel_engine_pulse(arg->engine);
> if (err)
> goto out;
> @@ -2146,7 +2146,7 @@ static int __cancel_active1(struct live_preempt_cancel *arg)
> if (err)
> goto out;
>
> - intel_context_set_banned(rq[1]->context);
> + intel_context_ban(rq[1]->context, rq[1]);
> err = intel_engine_pulse(arg->engine);
> if (err)
> goto out;
> @@ -2229,7 +2229,7 @@ static int __cancel_queued(struct live_preempt_cancel *arg)
> if (err)
> goto out;
>
> - intel_context_set_banned(rq[2]->context);
> + intel_context_ban(rq[2]->context, rq[2]);
> err = intel_engine_pulse(arg->engine);
> if (err)
> goto out;
> @@ -2244,7 +2244,13 @@ static int __cancel_queued(struct live_preempt_cancel *arg)
> goto out;
> }
>
> - if (rq[1]->fence.error != 0) {
> + /*
> + * The behavior between having semaphores and not is different. With
> + * semaphores the subsequent request is on the hardware and not cancelled
> + * while without the request is held in the driver and cancelled.
> + */
> + if (intel_engine_has_semaphores(rq[1]->engine) &&
> + rq[1]->fence.error != 0) {
> pr_err("Normal inflight1 request did not complete\n");
> err = -EINVAL;
> goto out;
> @@ -2292,7 +2298,7 @@ static int __cancel_hostile(struct live_preempt_cancel *arg)
> goto out;
> }
>
> - intel_context_set_banned(rq->context);
> + intel_context_ban(rq->context, rq);
> err = intel_engine_pulse(arg->engine); /* force reset */
> if (err)
> goto out;
next prev parent reply other threads:[~2022-07-28 2:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 2:42 [PATCH 0/6] Random assortment of (mostly) GuC related patches John.C.Harrison
2022-07-28 2:42 ` [PATCH 1/6] drm/i915/guc: Route semaphores to GuC for Gen12+ John.C.Harrison
2022-07-28 2:42 ` [PATCH 2/6] drm/i915/guc: Fix issues with live_preempt_cancel John.C.Harrison
2022-07-28 2:45 ` John Harrison [this message]
2022-07-28 2:42 ` [PATCH 3/6] drm/i915/guc: Add selftest for a hung GuC John.C.Harrison
2022-07-28 18:21 ` John Harrison
2022-07-28 18:26 ` John.C.Harrison
2022-07-28 18:33 ` John Harrison
2022-07-28 2:42 ` [PATCH 4/6] drm/i915/selftest: Cope with not having an RCS engine John.C.Harrison
2022-07-28 2:42 ` [PATCH 5/6] drm/i915/guc: Support larger contexts on newer hardware John.C.Harrison
2022-07-28 2:46 ` John Harrison
2022-07-28 2:42 ` [PATCH 6/6] drm/i915/guc: Don't abort on CTB_UNUSED status John.C.Harrison
2022-07-28 19:06 ` [Intel-gfx] " Michal Wajdeczko
2022-07-28 19:38 ` John Harrison
2022-07-29 0:00 ` Ceraolo Spurio, Daniele
2022-07-29 0:35 ` John Harrison
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=ddcd8ff4-4439-a560-9901-51120e603da6@intel.com \
--to=john.c.harrison@intel.com \
--cc=DRI-Devel@Lists.FreeDesktop.Org \
--cc=Intel-GFX@Lists.FreeDesktop.Org \
--cc=matthew.brost@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).