[PATCH V1 2/3] drm/xe/xelpg: Extend some workarounds to graphics version 12.74

[Matt Atwood]

On Thu, Feb 29, 2024 at 11:43:30AM +0530, Dnyaneshwar Bhadane wrote:
> From: Matt Roper <matthew.d.roper at intel.com>
> 
> A handful of Xe_LPG workarounds are also relevant to graphics version
> 12.74 as well. Extend the graphics version range for these workarounds
> accordingly.
> 
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
Reviewed-by: Matt Atwood <matthew.s.atwood at intel.com>
> ---
>  drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 +
>  drivers/gpu/drm/xe/xe_wa.c            | 8 ++++----
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/tests/xe_wa_test.c b/drivers/gpu/drm/xe/tests/xe_wa_test.c
> index 44570d888355..9d0c715142b9 100644
> --- a/drivers/gpu/drm/xe/tests/xe_wa_test.c
> +++ b/drivers/gpu/drm/xe/tests/xe_wa_test.c
> @@ -71,6 +71,7 @@ static const struct platform_test_case cases[] = {
>  	SUBPLATFORM_CASE(DG2, G12, A1),
>  	GMDID_CASE(METEORLAKE, 1270, A0, 1300, A0),
>  	GMDID_CASE(METEORLAKE, 1271, A0, 1300, A0),
> +	GMDID_CASE(METEORLAKE, 1274, A0, 1300, A0),
>  	GMDID_CASE(LUNARLAKE, 2004, A0, 2000, A0),
>  	GMDID_CASE(LUNARLAKE, 2004, B0, 2000, A0),
>  };
> diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
> index a0264eedd443..bcc285f45a1e 100644
> --- a/drivers/gpu/drm/xe/xe_wa.c
> +++ b/drivers/gpu/drm/xe/xe_wa.c
> @@ -173,11 +173,11 @@ static const struct xe_rtp_entry_sr gt_was[] = {
>  	  XE_RTP_ACTIONS(CLR(MISCCPCTL, DOP_CLOCK_GATE_RENDER_ENABLE))
>  	},
>  	{ XE_RTP_NAME("14018575942"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1271)),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1274)),
>  	  XE_RTP_ACTIONS(SET(COMP_MOD_CTRL, FORCE_MISS_FTLB))
>  	},
>  	{ XE_RTP_NAME("22016670082"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1271)),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1274)),
>  	  XE_RTP_ACTIONS(SET(SQCNT1, ENFORCE_RAR))
>  	},
>  
> @@ -397,7 +397,7 @@ static const struct xe_rtp_entry_sr engine_was[] = {
>  	/* Xe_LPG */
>  
>  	{ XE_RTP_NAME("14017856879"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1271),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1274),
>  		       FUNC(xe_rtp_match_first_render_or_compute)),
>  	  XE_RTP_ACTIONS(SET(ROW_CHICKEN3, DIS_FIX_EOT1_FLUSH))
>  	},
> @@ -537,7 +537,7 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
>  	/* Xe_LPG */
>  
>  	{ XE_RTP_NAME("18019271663"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1271)),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1270, 1274)),
>  	  XE_RTP_ACTIONS(SET(CACHE_MODE_1, MSAA_OPTIMIZATION_REDUC_DISABLE))
>  	},
>  	{ XE_RTP_NAME("14019877138"),
> -- 
> 2.34.1
>