Re: [PATCH] Revert "drm/xe/ptl: Apply Wa_16026007364"

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Tue, Jun 24, 2025 at 05:12:03PM -0700, Daniele Ceraolo Spurio wrote:
> This reverts commit 3972872e459d812ab5e481a231a6066cf4f4d0f4.
> 
> There are several things wrong with the way this WA was implemented:
> 
> - The KLV is only supported on GuC 70.47.0 or newer, so we shouldn't
>   apply it unconditionally.
> 
> - The KLV requires 2 DWs of data, which are not currently provided.
> 
> The GuC currently ignores any unknown KLVs, so on versions older that
> 70.47.0 nothing happens. However, starting on 70.47.0 the GuC attempts
> to parse the KLV and fails due to the missing data, causing a GuC load
> abort.
> 
> Given that 70.47.0 is the first GuC version approved for public release
> for PTL, let's revert this patch so it doesn't cause the GuC load to
> fail with that blob. We can then re-apply it properly fixed after the
> GuC definition is merged, which will also have the added benefit of
> running the KLV addition through CI with the right GuC version.
> 
I added
Fixes: 3972872e459d ("drm/xe/ptl: Apply Wa_16026007364")
to help tooling propagation and pushed to drm-xe-next

> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: sanirban <sk.anirban@intel.com>
> Cc: Badal Nilawar <badal.nilawar@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 -
>  drivers/gpu/drm/xe/xe_guc_ads.c       | 5 -----
>  drivers/gpu/drm/xe/xe_wa_oob.rules    | 1 -
>  3 files changed, 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> index e2583761a70d..7de8f827281f 100644
> --- a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> +++ b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> @@ -368,7 +368,6 @@ enum xe_guc_klv_ids {
>  	GUC_WORKAROUND_KLV_ID_BACK_TO_BACK_RCS_ENGINE_RESET				= 0x9009,
>  	GUC_WA_KLV_WAKE_POWER_DOMAINS_FOR_OUTBOUND_MMIO					= 0x900a,
>  	GUC_WA_KLV_RESET_BB_STACK_PTR_ON_VF_SWITCH					= 0x900b,
> -	GUC_WA_KLV_RESTORE_UNSAVED_MEDIA_CONTROL_REG					= 0x900c,
>  };
>  
>  #endif
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index f3c74f9a40c6..07a027755627 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -382,11 +382,6 @@ static void guc_waklv_init(struct xe_guc_ads *ads)
>  					GUC_WA_KLV_RESET_BB_STACK_PTR_ON_VF_SWITCH,
>  					&offset, &remain);
>  
> -	if (XE_WA(gt, 16026007364))
> -		guc_waklv_enable_simple(ads,
> -					GUC_WA_KLV_RESTORE_UNSAVED_MEDIA_CONTROL_REG,
> -					&offset, &remain);
> -
>  	size = guc_ads_waklv_size(ads) - remain;
>  	if (!size)
>  		return;
> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> index 8c2aa48cb33a..96cc33da0fb5 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -70,4 +70,3 @@ no_media_l3	MEDIA_VERSION(3000)
>  # SoC workaround - currently applies to all platforms with the following
>  # primary GT GMDID
>  14022085890	GRAPHICS_VERSION(2001)
> -16026007364 	MEDIA_VERSION(3000)
> -- 
> 2.43.0
>