[PATCH v2] drm/xe/ptl: Apply Wa_16026007364

[Nilawar, Badal]

On 19-06-2025 19:04, Sk Anirban wrote:
> From: sanirban <sk.anirban at intel.com>
>
> As part of this WA GuC will save and restore value of two XE3_Media
> control registers that were not included in the HW power context.
>
> v2:
>    - Update klv name (Badal)
>
> Signed-off-by: sanirban <sk.anirban at 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 insertions(+)
>
> diff --git a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> index 7de8f827281f..e2583761a70d 100644
> --- a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> +++ b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> @@ -368,6 +368,7 @@ 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 07a027755627..f3c74f9a40c6 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -382,6 +382,11 @@ 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);
> +

Looks good to me.

Reviewed-by: Badal Nilawar <badal.nilawar at intel.com>

Regards,
Badal

>   	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 96cc33da0fb5..8c2aa48cb33a 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -70,3 +70,4 @@ 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)