Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: <intel-xe@lists.freedesktop.org>,
	Julia Filipchuk <julia.filipchuk@intel.com>
Subject: Re: [PATCH 1/3] drm/xe/gsc: Make GSC FW load optional for newer platforms
Date: Thu, 8 Jan 2026 09:35:25 -0500	[thread overview]
Message-ID: <aV_ArSsLW8jWUgHI@intel.com> (raw)
In-Reply-To: <20260108011340.2562349-6-daniele.ceraolospurio@intel.com>

On Wed, Jan 07, 2026 at 05:13:42PM -0800, Daniele Ceraolo Spurio wrote:
> On newer platforms GSC FW is only required for content protection
> features, so the core driver features work perfectly fine without it
> (and we did in fact not enable it to start with on PTL). Therefore, we
> can selectively enable the GSC only if the FW is found on disk, without
> failing if it is not found.
> 
> Note that this means that the FW can now be enabled (i.e., we're looking
> for it) but not available (i.e., we haven't found it), so checks on FW
> support should use the latter state to decide whether to go on or not.
> 
> As part of the rework, the message for FW not found has been cleaned up
> to be more readable.
> 
> While at it, drop the comment about xe_uc_fw_init() since the code has
> been reworked and the statement no longer applies.
> 
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Julia Filipchuk <julia.filipchuk@intel.com>
> ---
>  drivers/gpu/drm/xe/display/xe_hdcp_gsc.c |  2 +-
>  drivers/gpu/drm/xe/xe_gsc.c              | 13 +++++++------
>  drivers/gpu/drm/xe/xe_uc_fw.c            | 10 +++++++---
>  3 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> index 07acae121aa7..ed1f65f5ef4d 100644
> --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> @@ -39,7 +39,7 @@ static bool intel_hdcp_gsc_check_status(struct drm_device *drm)
>  	struct xe_gt *gt = tile->media_gt;
>  	struct xe_gsc *gsc = &gt->uc.gsc;
>  
> -	if (!gsc || !xe_uc_fw_is_enabled(&gsc->fw)) {
> +	if (!gsc || !xe_uc_fw_is_available(&gsc->fw)) {
>  		drm_dbg_kms(&xe->drm,

should this be changed to a warn or info?

>  			    "GSC Components not ready for HDCP2.x\n");
>  		return false;
> diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c
> index a3157b0fe791..8ad27c884f68 100644
> --- a/drivers/gpu/drm/xe/xe_gsc.c
> +++ b/drivers/gpu/drm/xe/xe_gsc.c
> @@ -414,15 +414,16 @@ int xe_gsc_init(struct xe_gsc *gsc)
>  	}
>  
>  	/*
> -	 * Some platforms can have GuC but not GSC. That would cause
> -	 * xe_uc_fw_init(gsc) to return a "not supported" failure code and abort
> -	 * all firmware loading. So check for GSC being enabled before
> -	 * propagating the failure back up. That way the higher level will keep
> -	 * going and load GuC as appropriate.
> +	 * Starting from BMG the GSC is no longer needed for MC6 entry, so the
> +	 * only missing features if the FW is lacking would be the content
> +	 * protection ones. This is acceptable, si we allow the driver load to
> +	 * continue if the GSC FW is missing.
>  	 */
>  	ret = xe_uc_fw_init(&gsc->fw);
>  	if (!xe_uc_fw_is_enabled(&gsc->fw))
>  		return 0;
> +	else if (gt_to_xe(gt)->info.platform >= XE_BATTLEMAGE && !xe_uc_fw_is_available(&gsc->fw))
> +		return 0;
>  	else if (ret)
>  		goto out;
>  
> @@ -614,7 +615,7 @@ void xe_gsc_print_info(struct xe_gsc *gsc, struct drm_printer *p)
>  
>  	drm_printf(p, "\tfound security version %u\n", gsc->security_version);
>  
> -	if (!xe_uc_fw_is_enabled(&gsc->fw))
> +	if (!xe_uc_fw_is_available(&gsc->fw))
>  		return;
>  
>  	CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FW_GSC);
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index 50458d3bdc7d..b1a9ef3f6195 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -741,7 +741,7 @@ static int uc_fw_request(struct xe_uc_fw *uc_fw, const struct firmware **firmwar
>  		return 0;
>  	}
>  
> -	err = request_firmware(&fw, uc_fw->path, dev);
> +	err = firmware_request_nowarn(&fw, uc_fw->path, dev);
>  	if (err)
>  		goto fail;
>  
> @@ -770,8 +770,12 @@ static int uc_fw_request(struct xe_uc_fw *uc_fw, const struct firmware **firmwar
>  			       XE_UC_FIRMWARE_MISSING :
>  			       XE_UC_FIRMWARE_ERROR);
>  
> -	xe_gt_notice(gt, "%s firmware %s: fetch failed with error %pe\n",
> -		     xe_uc_fw_type_repr(uc_fw->type), uc_fw->path, ERR_PTR(err));
> +	if (err == -ENOENT)
> +		xe_gt_info(gt, "%s firmware %s not found\n",
> +			   xe_uc_fw_type_repr(uc_fw->type), uc_fw->path);
> +	else
> +		xe_gt_notice(gt, "%s firmware %s: fetch failed with error %pe\n",

shouldn't this be an warn or error?

> +			     xe_uc_fw_type_repr(uc_fw->type), uc_fw->path, ERR_PTR(err));
>  	xe_gt_info(gt, "%s firmware(s) can be downloaded from %s\n",
>  		   xe_uc_fw_type_repr(uc_fw->type), XE_UC_FIRMWARE_URL);
>  
> -- 
> 2.43.0
> 

  reply	other threads:[~2026-01-08 14:35 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-08  1:13 [PATCH 0/3] Enable GSC loading and PXP for PTL Daniele Ceraolo Spurio
2026-01-08  1:13 ` [PATCH 1/3] drm/xe/gsc: Make GSC FW load optional for newer platforms Daniele Ceraolo Spurio
2026-01-08 14:35   ` Rodrigo Vivi [this message]
2026-01-08 16:36     ` Daniele Ceraolo Spurio
2026-01-08 20:27       ` Rodrigo Vivi
2026-01-09 15:52   ` Julia Filipchuk
2026-01-08  1:13 ` [PATCH 2/3] drm/xe/ptl: Define GSC for PTL Daniele Ceraolo Spurio
2026-01-09 15:41   ` Julia Filipchuk
2026-01-08  1:13 ` [PATCH 3/3] drm/xe/ptl: Enable PXP " Daniele Ceraolo Spurio
2026-01-08 14:35   ` Rodrigo Vivi
2026-01-08  1:20 ` ✓ CI.KUnit: success for Enable GSC loading and " Patchwork
2026-01-08  1:53 ` ✓ Xe.CI.BAT: " Patchwork
2026-01-08  3:23 ` ✗ Xe.CI.Full: failure " Patchwork
2026-01-08 14:36 ` [PATCH 0/3] " Rodrigo Vivi
2026-01-12 18:03   ` Daniele Ceraolo Spurio
2026-01-10  0:28 ` ✓ CI.KUnit: success for Enable GSC loading and PXP for PTL (rev2) Patchwork
2026-01-10  1:01 ` ✓ Xe.CI.BAT: " Patchwork
2026-01-10  6:49 ` ✗ Xe.CI.Full: failure " Patchwork
2026-01-10 22:10 ` ✓ CI.KUnit: success for Enable GSC loading and PXP for PTL (rev3) Patchwork
2026-01-10 22:53 ` ✓ Xe.CI.BAT: " Patchwork
2026-01-10 23:50 ` ✗ Xe.CI.Full: 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=aV_ArSsLW8jWUgHI@intel.com \
    --to=rodrigo.vivi@intel.com \
    --cc=daniele.ceraolospurio@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=julia.filipchuk@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