dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Matthew Brost <matthew.brost@intel.com>
Cc: gfx-internal-devel@eclists.intel.com, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 5/9] drm/i915/guc: Flush the work queue for GuC generated G2H
Date: Thu, 12 Aug 2021 16:11:28 +0200	[thread overview]
Message-ID: <YRUsEAowykuHCjUM@phenom.ffwll.local> (raw)
In-Reply-To: <20210811011622.255784-6-matthew.brost@intel.com>

On Wed, Aug 11, 2021 at 01:16:18AM +0000, Matthew Brost wrote:
> Flush the work queue for GuC generated G2H messages durinr a GT reset.
> This is accomplished by spinning on the the list of outstanding G2H to
> go empty.
> 
> Fixes: eb5e7da736f3 ("drm/i915/guc: Reset implementation for new GuC interface")
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> Cc: <stable@vger.kernel.org>
> ---
>  drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> index 3cd2da6f5c03..e5eb2df11b4a 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> @@ -727,6 +727,11 @@ void intel_guc_submission_reset_prepare(struct intel_guc *guc)
>  			wait_for_reset(guc, &guc->outstanding_submission_g2h);
>  		} while (!list_empty(&guc->ct.requests.incoming));
>  	}
> +
> +	/* Flush any GuC generated G2H */
> +	while (!list_empty(&guc->ct.requests.incoming))
> +		msleep(20);

flush_work or flush_workqueue, beacuse that comes with lockdep
annotations. Dont hand-roll stuff like this if at all possible.
-Daniel

> +
>  	scrub_guc_desc_for_outstanding_g2h(guc);
>  }
>  
> -- 
> 2.32.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

  reply	other threads:[~2021-08-12 14:11 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11  1:16 [PATCH 0/9] Clean up some CI failures for GuC submission Matthew Brost
2021-08-11  1:16 ` [PATCH 1/9] drm/i915/guc: Fix blocked context accounting Matthew Brost
2021-08-11 10:30   ` Daniel Vetter
2021-08-11 17:28     ` Matthew Brost
2021-08-11  1:16 ` [PATCH 2/9] drm/i915/guc: outstanding G2H accounting Matthew Brost
2021-08-11  1:16 ` [PATCH 3/9] drm/i915/guc: Unwind context requests in reverse order Matthew Brost
2021-08-11  1:16 ` [PATCH 4/9] drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context Matthew Brost
2021-08-11  1:16 ` [PATCH 5/9] drm/i915/guc: Flush the work queue for GuC generated G2H Matthew Brost
2021-08-12 14:11   ` Daniel Vetter [this message]
2021-08-12 15:23     ` Matthew Brost
2021-08-12 19:47       ` Daniel Vetter
2021-08-12 22:38         ` Matthew Brost
2021-08-13 15:11           ` Daniel Vetter
2021-08-13 19:02             ` Matthew Brost
2021-08-16 15:39               ` Daniel Vetter
2021-08-11  1:16 ` [PATCH 6/9] drm/i915/guc: Do not clear enable during reset in an enable is inflight Matthew Brost
2021-08-11  1:16 ` [PATCH 7/9] drm/i915/guc: Don't enable scheduling on a banned context Matthew Brost
2021-08-11  1:16 ` [PATCH 8/9] drm/i915/selftests: Fix memory corruption in live_lrc_isolation Matthew Brost
2021-08-11  1:16 ` [PATCH 9/9] drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H Matthew Brost

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=YRUsEAowykuHCjUM@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gfx-internal-devel@eclists.intel.com \
    --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