Re: [PATCH 01/23] drm/xe/xe3: Add support for graphics IP versions 30.04 & 30.05

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

On 10/14/2025 8:54, Lucas De Marchi wrote:
> From: Shekhar Chauhan <shekhar.chauhan@intel.com>
>
> Add graphics IP versions 30.04 & 30.05 and initial workarounds for these
> IP versions.
>
> BSpec: 74201
> Cc: Sai Teja Pottumuttu <sai.teja.pottumuttu@intel.com>
> Signed-off-by: Shekhar Chauhan <shekhar.chauhan@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>   drivers/gpu/drm/xe/xe_pci.c        | 2 ++
>   drivers/gpu/drm/xe/xe_wa.c         | 6 +++---
>   drivers/gpu/drm/xe/xe_wa_oob.rules | 7 +++++--
>   3 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index 944c698808ace..c1e89689953b7 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -149,6 +149,8 @@ static const struct xe_ip graphics_ips[] = {
>   	{ 3000, "Xe3_LPG", &graphics_xe2 },
>   	{ 3001, "Xe3_LPG", &graphics_xe2 },
>   	{ 3003, "Xe3_LPG", &graphics_xe2 },
> +	{ 3004, "Xe3_LPG", &graphics_xe2 },
> +	{ 3005, "Xe3_LPG", &graphics_xe2 },
>   };
>   
>   /* Pre-GMDID Media IPs */
> diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
> index c60159a130014..24b6d4bb0b962 100644
> --- a/drivers/gpu/drm/xe/xe_wa.c
> +++ b/drivers/gpu/drm/xe/xe_wa.c
> @@ -684,7 +684,7 @@ static const struct xe_rtp_entry_sr engine_was[] = {
>   	},
>   	{ XE_RTP_NAME("13012615864"),
>   	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3001), OR,
> -		       GRAPHICS_VERSION(3003),
> +		       GRAPHICS_VERSION_RANGE(3003, 3005),
>   		       FUNC(xe_rtp_match_first_render_or_compute)),
>   	  XE_RTP_ACTIONS(SET(TDL_TSL_CHICKEN, RES_CHK_SPR_DIS))
>   	},
> @@ -695,7 +695,7 @@ static const struct xe_rtp_entry_sr engine_was[] = {
>   			     XE_RTP_ACTION_FLAG(ENGINE_BASE)))
>   	},
>   	{ XE_RTP_NAME("14021402888"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION(3003), FUNC(xe_rtp_match_first_render_or_compute)),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3003, 3005), FUNC(xe_rtp_match_first_render_or_compute)),
>   	  XE_RTP_ACTIONS(SET(HALF_SLICE_CHICKEN7, CLEAR_OPTIMIZATION_DISABLE))
>   	},
>   	{ XE_RTP_NAME("18041344222"),
> @@ -913,7 +913,7 @@ static const struct xe_rtp_entry_sr lrc_was[] = {
>   			     DIS_AUTOSTRIP))
>   	},
>   	{ XE_RTP_NAME("22021007897"),
> -	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3003), ENGINE_CLASS(RENDER)),
> +	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3005), ENGINE_CLASS(RENDER)),
>   	  XE_RTP_ACTIONS(SET(COMMON_SLICE_CHICKEN4, SBE_PUSH_CONSTANT_BEHIND_FIX_ENABLE))
>   	},
>   };
> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> index f3a6d5d239cec..9aff2e56fd3e4 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -34,14 +34,17 @@
>   13011645652	GRAPHICS_VERSION(2004)
>   		GRAPHICS_VERSION_RANGE(3000, 3001)
>   		GRAPHICS_VERSION(3003)
> +		GRAPHICS_VERSION_RANGE(3004, 3005)
>   14022293748	GRAPHICS_VERSION_RANGE(2001, 2002)

Any specific reason for keeping 3003 different from the range of (3004, 
3005)? Can we have a single range from (3003, 3005)? Same for the two 
additions below.

Other than this, there are a couple of new workarounds which are 
introduced for these IPs, but maybe we can add them once the initial 
upstreaming is finished, nothing major.

Apart from these two comments, LGTM, and,

Reviewed-by: Shekhar Chauhan <shekhar.chauhan@intel.com>

>   		GRAPHICS_VERSION(2004)
>   		GRAPHICS_VERSION_RANGE(3000, 3001)
>   		GRAPHICS_VERSION(3003)
> +		GRAPHICS_VERSION_RANGE(3004, 3005)
>   22019794406	GRAPHICS_VERSION_RANGE(2001, 2002)
>   		GRAPHICS_VERSION(2004)
>   		GRAPHICS_VERSION_RANGE(3000, 3001)
>   		GRAPHICS_VERSION(3003)
> +		GRAPHICS_VERSION_RANGE(3004, 3005)
>   22019338487	MEDIA_VERSION(2000)
>   		GRAPHICS_VERSION(2001), FUNC(xe_rtp_match_not_sriov_vf)
>   		MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_not_sriov_vf)
> @@ -63,11 +66,11 @@
>   16023105232	GRAPHICS_VERSION_RANGE(2001, 3001)
>   		MEDIA_VERSION_RANGE(1301, 3000)
>   		MEDIA_VERSION(3002)
> -		GRAPHICS_VERSION(3003)
> +		GRAPHICS_VERSION_RANGE(3003, 3005)
>   16026508708	GRAPHICS_VERSION_RANGE(1200, 3001)
>   		MEDIA_VERSION_RANGE(1300, 3000)
>   		MEDIA_VERSION(3002)
> -		GRAPHICS_VERSION(3003)
> +		GRAPHICS_VERSION_RANGE(3003, 3005)
>   14020001231	GRAPHICS_VERSION_RANGE(2001,2004), FUNC(xe_rtp_match_psmi_enabled)
>   		MEDIA_VERSION(2000), FUNC(xe_rtp_match_psmi_enabled)
>   		MEDIA_VERSION(3000), FUNC(xe_rtp_match_psmi_enabled)
>