[PATCH 1/3] Revert "drm/xe/guc: Pre-release GuC firmware v70.24.0 for LNL/BMG/PVC"

[Cavitt, Jonathan]

-----Original Message-----
From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Julia Filipchuk
Sent: Thursday, August 1, 2024 1:34 PM
To: intel-xe at lists.freedesktop.org
Cc: Filipchuk, Julia <julia.filipchuk at intel.com>
Subject: [PATCH 1/3] Revert "drm/xe/guc: Pre-release GuC firmware v70.24.0 for LNL/BMG/PVC"
> 
> This reverts commit dbd3e63b48f43788cb31eac045a848508a5c14df.

LGTM, though I don't fully remember if revert commits also require
Signed-off-bys.

Also, may I ask why this revert is needed?  It seems like the related
following patches are just modifying the fw_def values for some of
the platforms and adding a new macro.  So theoretically that could
be accomplished in two patches - one that updates the fw_def values,
and a second to add the new functionality to guc_read_css_info.

I won't block on the explanation, I was just curious.
Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt

> ---
>  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))	\
> -- 
> 2.45.2
> 
>