[PATCH 5/5] drm/xe/xe2: Add proper check for media in Wa_14020756599

[Matt Roper]

On Mon, Jun 17, 2024 at 11:25:18AM -0700, Lucas De Marchi wrote:
> A temporary fixup was made in commit 24d0d98af1c3 ("drm/xe/xe2lpm: Fixup
> Wa_14020756599") due to limitations in the RTP infra. Now that RTP has
> support for OR condition that change can be removed. RTP now also
> supports checking any GT, so use that instead of the more specific
> xe_rtp_match_when_media2000() used in that commit.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_wa.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
> index a2725a150441..0b6fbbebc41e 100644
> --- a/drivers/gpu/drm/xe/xe_wa.c
> +++ b/drivers/gpu/drm/xe/xe_wa.c
> @@ -677,15 +677,9 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
>  		       ENGINE_CLASS(RENDER)),
>  	  XE_RTP_ACTIONS(SET(CHICKEN_RASTER_2, TBIMR_FAST_CLIP))
>  	},
> -	/*
> -	 * This WA is also needed on primary GT when the media version is 2000.
> -	 * Currently, media version 2000 is always paired with graphics version
> -	 * 2004, so just checking the latter is sufficient. In the future, media
> -	 * version 2000 can be used with some other graphics version where WA
> -	 * still needs to be implemented
> -	 */
>  	{ XE_RTP_NAME("14020756599"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION(2004), ENGINE_CLASS(RENDER)),
> +	  XE_RTP_RULES(GRAPHICS_VERSION(2004), ENGINE_CLASS(RENDER), OR,
> +		       MEDIA_VERSION_ANY_GT(2000), ENGINE_CLASS(RENDER)),
>  	  XE_RTP_ACTIONS(SET(WM_CHICKEN3, HIZ_PLANE_COMPRESSION_DIS))
>  	},
>  	{ XE_RTP_NAME("14021490052"),
> -- 
> 2.43.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation