Re: [PATCH v3 1/4] drm/xe/guc: Drop use of pre-release GuC definitions for LNL and BMG

[Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>]

On 8/1/2024 3:42 PM, Julia Filipchuk wrote:
> With BMG, LNL guc binaries ready in linux-fimware, we remove pre-release
> definitions to prepare for final defines of recommended firmware
> version.
>
> This patch is meant to be squashed with the patch in xe-for-ci that adds
> the definitions ("drm/xe/guc: Pre-release GuC firmware v70.24.0 for LNL/BMG/PVC"). We want to keep the PVC definition from that patch.

The code below is a full revert of that patch (which is the correct 
thing to do), but the commit title and the text above don't reflect that 
and instead only mention LNL and BMG. Not a blocker since we're not 
going to merge this patch and we're instead just going to remove that 
one from the CI branch.

Daniele

> ---
>   drivers/gpu/drm/xe/xe_uc_fw.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index 6b92255a769d..5b70d23724c4 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -105,10 +105,8 @@ struct fw_blobs_by_type {
>   };
>   
>   #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver)			\
> -	fw_def(BATTLEMAGE,	major_ver(intel-ci/xe,	guc,	bmg,	70, 24, 0))	\
> -	fw_def(LUNARLAKE,	major_ver(intel-ci/xe,	guc,	lnl,	70, 24, 0))	\
> +	fw_def(LUNARLAKE,	major_ver(xe,	guc,	lnl,	70, 19, 2))	\
>   	fw_def(METEORLAKE,	major_ver(i915,	guc,	mtl,	70, 19, 2))	\
> -	fw_def(PVC,		mmp_ver(intel-ci/xe, guc, pvc,	70, 24, 0))	\
>   	fw_def(DG2,		major_ver(i915,	guc,	dg2,	70, 19, 2))	\
>   	fw_def(DG1,		major_ver(i915,	guc,	dg1,	70, 19, 2))	\
>   	fw_def(ALDERLAKE_N,	major_ver(i915,	guc,	tgl,	70, 19, 2))	\