From: "Ye, Tony" <tony.ye@intel.com>
To: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>,
<intel-gfx@lists.freedesktop.org>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v4 12/15] drm/i915/huc: stall media submission until HuC is loaded
Date: Fri, 9 Sep 2022 14:20:30 -0700 [thread overview]
Message-ID: <fd942c06-1b0d-311c-35df-8632ee96fce4@intel.com> (raw)
In-Reply-To: <20220909001612.728451-13-daniele.ceraolospurio@intel.com>
On 9/8/2022 5:16 PM, Daniele Ceraolo Spurio wrote:
> Wait on the fence to be signalled to avoid the submissions finding HuC
> not yet loaded.
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Tony Ye <tony.ye@intel.com>
> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_huc.h | 6 ++++++
> drivers/gpu/drm/i915/i915_request.c | 24 ++++++++++++++++++++++++
> 2 files changed, 30 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.h b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> index 915d281c1c72..52db03620c60 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.h
> @@ -81,6 +81,12 @@ static inline bool intel_huc_is_loaded_by_gsc(const struct intel_huc *huc)
> return huc->fw.loaded_via_gsc;
> }
>
> +static inline bool intel_huc_wait_required(struct intel_huc *huc)
> +{
> + return intel_huc_is_used(huc) && intel_huc_is_loaded_by_gsc(huc) &&
> + !intel_huc_is_authenticated(huc);
> +}
> +
> void intel_huc_load_status(struct intel_huc *huc, struct drm_printer *p);
>
> #endif
> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> index 62fad16a55e8..77f45a3cb01f 100644
> --- a/drivers/gpu/drm/i915/i915_request.c
> +++ b/drivers/gpu/drm/i915/i915_request.c
> @@ -1621,6 +1621,20 @@ i915_request_await_object(struct i915_request *to,
> return ret;
> }
>
> +static void i915_request_await_huc(struct i915_request *rq)
> +{
> + struct intel_huc *huc = &rq->context->engine->gt->uc.huc;
> +
> + /* don't stall kernel submissions! */
> + if (!rcu_access_pointer(rq->context->gem_context))
> + return;
> +
> + if (intel_huc_wait_required(huc))
> + i915_sw_fence_await_sw_fence(&rq->submit,
> + &huc->delayed_load.fence,
> + &rq->submitq);
> +}
> +
> static struct i915_request *
> __i915_request_ensure_parallel_ordering(struct i915_request *rq,
> struct intel_timeline *timeline)
> @@ -1702,6 +1716,16 @@ __i915_request_add_to_timeline(struct i915_request *rq)
> struct intel_timeline *timeline = i915_request_timeline(rq);
> struct i915_request *prev;
>
> + /*
> + * Media workloads may require HuC, so stall them until HuC loading is
> + * complete. Note that HuC not being loaded when a user submission
> + * arrives can only happen when HuC is loaded via GSC and in that case
> + * we still expect the window between us starting to accept submissions
> + * and HuC loading completion to be small (a few hundred ms).
> + */
> + if (rq->engine->class == VIDEO_DECODE_CLASS)
> + i915_request_await_huc(rq);
> +
Acked-by: Tony Ye <tony.ye@intel.com>
Thanks,
Tony
> /*
> * Dependency tracking and request ordering along the timeline
> * is special cased so that we can eliminate redundant ordering
next prev parent reply other threads:[~2022-09-09 21:20 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 0:15 [PATCH v4 00/15] drm/i915: HuC loading for DG2 Daniele Ceraolo Spurio
2022-09-09 0:15 ` [PATCH v4 01/15] mei: add support to GSC extended header Daniele Ceraolo Spurio
2022-09-09 6:11 ` Greg Kroah-Hartman
2022-09-09 6:29 ` Winkler, Tomas
2022-09-09 0:15 ` [PATCH v4 02/15] mei: bus: enable sending gsc commands Daniele Ceraolo Spurio
2022-09-09 0:16 ` [PATCH v4 03/15] mei: adjust extended header kdocs Daniele Ceraolo Spurio
2022-09-09 6:12 ` Greg Kroah-Hartman
2022-09-09 0:16 ` [PATCH v4 04/15] mei: bus: extend bus API to support command streamer API Daniele Ceraolo Spurio
2022-09-09 0:16 ` [PATCH v4 05/15] mei: pxp: add command streamer API to the PXP driver Daniele Ceraolo Spurio
2022-09-09 6:14 ` Greg Kroah-Hartman
2022-09-09 6:38 ` Winkler, Tomas
2022-09-09 6:42 ` Greg Kroah-Hartman
2022-09-12 9:59 ` Winkler, Tomas
2022-09-12 14:25 ` Greg Kroah-Hartman
2022-09-09 0:16 ` [PATCH v4 06/15] mei: pxp: support matching with a gfx discrete card Daniele Ceraolo Spurio
2022-09-09 6:16 ` Greg Kroah-Hartman
2022-09-09 6:51 ` Winkler, Tomas
2022-09-09 6:59 ` Greg Kroah-Hartman
2022-09-09 9:21 ` Winkler, Tomas
2022-09-09 10:19 ` Greg Kroah-Hartman
2022-09-12 10:05 ` Winkler, Tomas
2022-09-09 0:16 ` [PATCH v4 07/15] drm/i915/pxp: load the pxp module when we have a gsc-loaded huc Daniele Ceraolo Spurio
2022-09-09 0:16 ` [PATCH v4 08/15] drm/i915/pxp: implement function for sending tee stream command Daniele Ceraolo Spurio
2022-09-09 0:16 ` [PATCH v4 09/15] drm/i915/pxp: add huc authentication and loading command Daniele Ceraolo Spurio
2022-09-09 0:16 ` [PATCH v4 10/15] drm/i915/dg2: setup HuC loading via GSC Daniele Ceraolo Spurio
2022-09-09 20:54 ` Teres Alexis, Alan Previn
2022-09-09 0:16 ` [PATCH v4 11/15] drm/i915/huc: track delayed HuC load with a fence Daniele Ceraolo Spurio
2022-09-09 21:10 ` Teres Alexis, Alan Previn
2022-09-09 0:16 ` [PATCH v4 12/15] drm/i915/huc: stall media submission until HuC is loaded Daniele Ceraolo Spurio
2022-09-09 21:20 ` Ye, Tony [this message]
2022-09-09 0:16 ` [PATCH v4 13/15] drm/i915/huc: better define HuC status getparam possible return values Daniele Ceraolo Spurio
2022-09-09 0:16 ` [PATCH v4 14/15] drm/i915/huc: define gsc-compatible HuC fw for DG2 Daniele Ceraolo Spurio
2022-09-09 21:20 ` Ye, Tony
2022-09-10 0:18 ` Teres Alexis, Alan Previn
2022-09-09 0:16 ` [PATCH v4 15/15] HAX: drm/i915: force INTEL_MEI_GSC and INTEL_MEI_PXP on for CI Daniele Ceraolo Spurio
2022-09-09 0:22 ` Ceraolo Spurio, Daniele
2022-09-09 6:01 ` [PATCH v4 00/15] drm/i915: HuC loading for DG2 Winkler, Tomas
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=fd942c06-1b0d-311c-35df-8632ee96fce4@intel.com \
--to=tony.ye@intel.com \
--cc=alan.previn.teres.alexis@intel.com \
--cc=daniele.ceraolospurio@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--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;
as well as URLs for NNTP newsgroup(s).