Re: [PATCH] drm/xe/wa: Drop redundant entries for Wa_16021867713 & Wa_14019449301

[Simona Vetter <simona.vetter@ffwll.ch>]

On Thu, Mar 12, 2026 at 09:29:23AM -0700, Matt Roper wrote:
> The Xe2_HPM-specific RTP table entries for Wa_16021867713 and
> Wa_14019449301 were removed by commit 941f538b0af8 ("drm/xe: Consolidate
> workaround entries for Wa_16021867713") and commit aa0f0a678370
> ("drm/xe: Consolidate workaround entries for Wa_14019449301") in favor
> of alternate entries earlier in the table that cover a wider range of IP
> versions.  However these Xe2_HPM-specific entries were accidentally
> resurrected during a backmerge, which causes the Xe driver to complain
> on probe about two entries trying to program the same registers+bits:
> 
>   <3> [48.491155] xe 0000:03:00.0: [drm] *ERROR* Tile0: GT1: discarding save-restore reg 1c3f1c (clear: 00000008, set: 00000008, masked: no, mcr: no): ret=-22
>   <3> [48.491211] xe 0000:03:00.0: [drm] *ERROR* Tile0: GT1: discarding save-restore reg 1d3f1c (clear: 00000008, set: 00000008, masked: no, mcr: no): ret=-22
>   <3> [48.491225] xe 0000:03:00.0: [drm] *ERROR* Tile0: GT1: discarding save-restore reg 1c3f08 (clear: 00000020, set: 00000020, masked: no, mcr: no): ret=-22
>   <3> [48.491238] xe 0000:03:00.0: [drm] *ERROR* Tile0: GT1: discarding save-restore reg 1d3f08 (clear: 00000020, set: 00000020, masked: no, mcr: no): ret=-22
> 
> Re-drop the redundant Xe2_HPM-specific entries to eliminate the dmesg
> errors.
> 
> Fixes: 58351f46de26 ("Merge v7.0-rc3 into drm-next")
> Cc: Simona Vetter <simona.vetter@ffwll.ch>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>
> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/7608
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

Oops, sorry :-/

Reviewed-by: Simona Vetter <simona.vetter@ffwll.ch>

Since there's already a backmerge I think it's best to land this directly
in drm-xe-next since it's just a warning.
-Sima

> ---
>  drivers/gpu/drm/xe/xe_wa.c | 14 --------------
>  1 file changed, 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
> index 025ec102bf0776f0fdb408f66123fa2ff3d84103..8c55cd187a0c2f17f1d6ed0ef2f9c7a87913a840 100644
> --- a/drivers/gpu/drm/xe/xe_wa.c
> +++ b/drivers/gpu/drm/xe/xe_wa.c
> @@ -263,20 +263,6 @@ static const struct xe_rtp_entry_sr gt_was[] = {
>  				   LSN_DIM_Z_WGT(1)))
>  	},
>  
> -	/* Xe2_HPM */
> -
> -	{ XE_RTP_NAME("16021867713"),
> -	  XE_RTP_RULES(MEDIA_VERSION(1301),
> -		       ENGINE_CLASS(VIDEO_DECODE)),
> -	  XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F1C(0), MFXPIPE_CLKGATE_DIS)),
> -	  XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
> -	},
> -	{ XE_RTP_NAME("14019449301"),
> -	  XE_RTP_RULES(MEDIA_VERSION(1301), ENGINE_CLASS(VIDEO_DECODE)),
> -	  XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F08(0), CG3DDISHRS_CLKGATE_DIS)),
> -	  XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
> -	},
> -
>  	/* Xe3_LPG */
>  
>  	{ XE_RTP_NAME("14021871409"),
> 
> ---
> base-commit: 3ccc0e3404591e404d0dee79406cd013f377356a
> change-id: 20260312-wa_merge_fix-3e8f83cb56b6
> 
> Best regards,
> -- 
> Matt Roper
> Graphics Software Engineer
> Linux GPU Platform Enablement
> Intel Corporation
> 

-- 
Simona Vetter
Software Engineer
http://blog.ffwll.ch