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

[Daniele Ceraolo Spurio]

On 8/2/2024 3:21 PM, John.C.Harrison at Intel.com wrote:
> From: Julia Filipchuk <julia.filipchuk at intel.com>
>
> This reverts commit dbd3e63b48f43788cb31eac045a848508a5c14df.
>
> Signed-off-by: Julia Filipchuk <julia.filipchuk at intel.com>
> Signed-off-by: John Harrison <John.C.Harrison at Intel.com>

Acked-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>

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