Re: [PATCH v2 4/6] drm/xe/uc: Support fetching different FW files per-subplatform

["Teres Alexis, Alan Previn" <alan.previn.teres.alexis@intel.com>]

On Wed, 2026-08-26 at 17:11 +0000, Daniele Ceraolo Spurio wrote:
> 
> 
alan:[snip]
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index 3a74acfaf2c7..12fbc25dc6b8 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> 
alan:[snip]

>  /* for the GSC FW we match the compatibility version and not the release one */
>  #define XE_GSC_FIRMWARE_DEFS(fw_def, major_ver)		\
> -	fw_def(PANTHERLAKE,	GT_TYPE_MEDIA,	major_ver(xe,	gsc,	ptl,	105, 1, 0))	\
> -	fw_def(LUNARLAKE,	GT_TYPE_MEDIA,	major_ver(xe,	gsc,	lnl,	104, 1, 0))	\
> -	fw_def(METEORLAKE,	GT_TYPE_MEDIA,	major_ver(i915,	gsc,	mtl,	102, 1, 0))
> +	fw_def(PANTHERLAKE,	SUBPLATFORM_ANY,	major_ver(xe,	gsc,	ptl,	105, 1, 0))	\
> +	fw_def(LUNARLAKE,	SUBPLATFORM_ANY,	major_ver(xe,	gsc,	lnl,	104, 1, 0))	\
> +	fw_def(METEORLAKE,	SUBPLATFORM_ANY,	major_ver(i915,	gsc,	mtl,	102, 1, 0))
>  
>  #define MAKE_FW_PATH(dir__, uc__, shortname__, version__)			\
>  	__stringify(dir__) "/" __stringify(shortname__) "_" __stringify(uc__) version__ ".bin"
> @@ -181,10 +183,19 @@ struct fw_blobs_by_type {
>  #define XE_UC_FW_ENTRY(platform__, gt_type__, entry__)				\
>  	{									\
>  		.platform = XE_ ## platform__,					\
> +		.subplatform = XE_SUBPLATFORM_ANY,				\
>  		.gt_type = XE_ ## gt_type__,					\
>  		entry__,							\
>  	},
>  
> +#define XE_GSC_FW_ENTRY(platform__, subplatform__, entry__)			\
> +	{									\
> +		.platform = XE_ ## platform__,					\
> +		.subplatform = XE_ ## subplatform__,				\
> +		.gt_type = XE_GT_TYPE_MEDIA,					\
> +		entry__,							\
> +	},
> 
> 
I can see we are bifurcating the macros that generate fw_def arrays
for GSC vs the-rest where GSC is always GT_TYPE_MEDIA and allows
explicit sub-platform while the-rest needs explicit GT_TYPE but
is always SUBPLATFORM_ANY.

In the interest of minimal changes and keeping the layout
of our arrays concise, i think this is a good approach.

Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com>

alan:[snip]