[PATCH 2/6] drm/xe/xe3: Add support for graphics IP version 30.03

[Matt Roper]

On Thu, Jun 05, 2025 at 11:18:44AM +0530, Shekhar Chauhan wrote:
> 
> On 6/3/2025 23:54, Dnyaneshwar Bhadane wrote:
> > From: Matt Roper <matthew.d.roper at intel.com>
> > 
> > Graphics version 30.03 should be treated the same as other Xe3 IP, but
> > will have a slightly different set of workarounds.
> > 
> > Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> > Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane at intel.com>
> > ---
> >   drivers/gpu/drm/xe/xe_pci.c        | 1 +
> >   drivers/gpu/drm/xe/xe_wa.c         | 4 ++++
> >   drivers/gpu/drm/xe/xe_wa_oob.rules | 5 ++++-
> >   3 files changed, 9 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> > index b68c90910d82..247cd928b933 100644
> > --- a/drivers/gpu/drm/xe/xe_pci.c
> > +++ b/drivers/gpu/drm/xe/xe_pci.c
> > @@ -182,6 +182,7 @@ static const struct xe_ip graphics_ips[] = {
> >   	{ 2004, "Xe2_LPG", &graphics_xe2 },
> >   	{ 3000, "Xe3_LPG", &graphics_xe2 },
> >   	{ 3001, "Xe3_LPG", &graphics_xe2 },
> > +	{ 3003, "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
> 
> Any reason why we're merging the addition of Graphics-GMD_ID patch with the
> List-of-workarounds' patch? Historically, we've kept these two as separate
> patches, right?

There haven't really been many cases in the past where we just add an
additional version number to an existing IP/platform that doesn't have
more meaningful functional changes.  The only case I can think of is
when 12.74 was added as another variant of Xe_LP; the commit
81f8729dbc0b ("drm/xe/xelpg: Recognize graphics version 12.74 as
Xe_LPG") added the new version number and the corresponding workaround
updates as a single patch for simplicity, and we're following the same
approach here.

Since the only new thing associated with the version number is a
slightly different list of workarounds, there doesn't seem to be a need
to split them up.  This will also make it slightly easier to backport
the support for the new version number to older kernels if necessary.


Matt

> 
> -shekhar
> 
> > index 67196baa4249..5f750054a9c4 100644
> > --- a/drivers/gpu/drm/xe/xe_wa.c
> > +++ b/drivers/gpu/drm/xe/xe_wa.c
> > @@ -640,6 +640,10 @@ static const struct xe_rtp_entry_sr engine_was[] = {
> >   	  XE_RTP_ACTIONS(SET(RING_PSMI_CTL(0), RC_SEMA_IDLE_MSG_DISABLE,
> >   			     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_ACTIONS(SET(HALF_SLICE_CHICKEN7, CLEAR_OPTIMIZATION_DISABLE))
> > +	},
> >   };
> >   static const struct xe_rtp_entry_sr lrc_was[] = {
> > diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> > index 9efc5accd43d..557d23c1bb9f 100644
> > --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> > +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> > @@ -33,9 +33,11 @@
> >   14022293748	GRAPHICS_VERSION(2001)
> >   		GRAPHICS_VERSION(2004)
> >   		GRAPHICS_VERSION_RANGE(3000, 3001)
> > +		GRAPHICS_VERSION(3003)
> >   22019794406	GRAPHICS_VERSION(2001)
> >   		GRAPHICS_VERSION(2004)
> >   		GRAPHICS_VERSION_RANGE(3000, 3001)
> > +		GRAPHICS_VERSION(3003)
> >   22019338487	MEDIA_VERSION(2000)
> >   		GRAPHICS_VERSION(2001)
> >   		MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_not_sriov_vf)
> > @@ -57,5 +59,6 @@ no_media_l3	MEDIA_VERSION(3000)
> >   		GRAPHICS_VERSION(1260), GRAPHICS_STEP(A0, B0)
> >   16023105232	GRAPHICS_VERSION_RANGE(2001, 3001)
> >   		MEDIA_VERSION_RANGE(1301, 3000)
> > -16026508708	GRAPHICS_VERSION_RANGE(1200, 3001)
> > +		GRAPHICS_VERSION(3003)
> > +16026508708	GRAPHICS_VERSION_RANGE(1200, 3003)
> >   		MEDIA_VERSION_RANGE(1300, 3000)

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