Re: [PATCH] drm/xe/xe2_hpg: Fix handling of Wa_14019988906 & Wa_14019877138

[Shekhar Chauhan <shekhar.chauhan@intel.com>]

On 2/6/2026 3:35, Matt Roper wrote:
> The PSS_CHICKEN register has been part of the RCS engine's LRC since it
> was first introduced in Xe_LP.  That means that any workarounds that
> adjust its value (such as Wa_14019988906 and Wa_14019877138) need to be
> implemented in the lrc_was[] table so that they become part of the
> default LRC from which all subsequent LRCs are copied.  Although these
> workarounds were implemented correctly on most platforms, they were
> incorrectly placed on the engine_was[] table for Xe2_HPG.
>
> Move the workarounds to the proper lrc_was[] table and switch the
> 'xe_rtp_match_first_render_or_compute' rule to specifically match the
> RCS since that's the engine whose LRC manages the register.
>
> Bspec: 65182
> Fixes: 7f3ee7d88058 ("drm/xe/xe2hpg: Add initial GT workarounds")
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
LGTM,
Reviewed-by: Shekhar Chauhan <shekhar.chauhan@intel.com>
> ---
>   drivers/gpu/drm/xe/xe_wa.c | 18 ++++++++----------
>   1 file changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
> index 1e8d61ac581b..d37edc62b6a6 100644
> --- a/drivers/gpu/drm/xe/xe_wa.c
> +++ b/drivers/gpu/drm/xe/xe_wa.c
> @@ -567,16 +567,6 @@ static const struct xe_rtp_entry_sr engine_was[] = {
>   		       FUNC(xe_rtp_match_first_render_or_compute)),
>   	  XE_RTP_ACTIONS(SET(ROW_CHICKEN, EARLY_EOT_DIS))
>   	},
> -	{ XE_RTP_NAME("14019988906"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
> -		       FUNC(xe_rtp_match_first_render_or_compute)),
> -	  XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FLSH_IGNORES_PSD))
> -	},
> -	{ XE_RTP_NAME("14019877138"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
> -		       FUNC(xe_rtp_match_first_render_or_compute)),
> -	  XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FD_END_COLLECT))
> -	},
>   	{ XE_RTP_NAME("14020338487"),
>   	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
>   		       FUNC(xe_rtp_match_first_render_or_compute)),
> @@ -852,6 +842,14 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
>   	  XE_RTP_RULES(GRAPHICS_VERSION(2001), ENGINE_CLASS(RENDER)),
>   	  XE_RTP_ACTIONS(SET(WM_CHICKEN3, HIZ_PLANE_COMPRESSION_DIS))
>   	},
> +	{ XE_RTP_NAME("14019988906"),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002), ENGINE_CLASS(RENDER)),
> +	  XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FLSH_IGNORES_PSD))
> +	},
> +	{ XE_RTP_NAME("14019877138"),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002), ENGINE_CLASS(RENDER)),
> +	  XE_RTP_ACTIONS(SET(XEHP_PSS_CHICKEN, FD_END_COLLECT))
> +	},
>   	{ XE_RTP_NAME("14021490052"),
>   	  XE_RTP_RULES(GRAPHICS_VERSION(2001), ENGINE_CLASS(RENDER)),
>   	  XE_RTP_ACTIONS(SET(FF_MODE,