On Thu, Jun 12, 2025 at 12:20:05PM +0530, Pottumuttu, Sai Teja wrote:
> On 11-06-2025 19:14, Dnyaneshwar Bhadane wrote:
> > From: Matt Roper <matthew.d.ro...@intel.com>
> >
> > Graphics version 30.03 should be treated the same as other Xe3 IP, but
> > will have a slightly different set of workarounds.
> >
> > -v2: Merge and extend the WA onto existing entry (Bala)
> >
> > Signed-off-by: Matt Roper <matthew.d.ro...@intel.com>
> > Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhad...@intel.com>
> > ---
> > drivers/gpu/drm/xe/xe_pci.c | 1 +
> > drivers/gpu/drm/xe/xe_wa.c | 2 +-
> > drivers/gpu/drm/xe/xe_wa_oob.rules | 7 ++++---
> > 3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> > index b5559800db7a..8824a8016b1c 100644
> > --- a/drivers/gpu/drm/xe/xe_pci.c
> > +++ b/drivers/gpu/drm/xe/xe_pci.c
> > @@ -183,6 +183,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
> > index 67196baa4249..8693d098aa9b 100644
> > --- a/drivers/gpu/drm/xe/xe_wa.c
> > +++ b/drivers/gpu/drm/xe/xe_wa.c
> > @@ -609,7 +609,7 @@ static const struct xe_rtp_entry_sr engine_was[] = {
> > /* Xe3_LPG */
> > { XE_RTP_NAME("14021402888"),
> > - XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3001),
> > + XE_RTP_RULES(GRAPHICS_VERSION_RANGE(3000, 3003),
> > FUNC(xe_rtp_match_first_render_or_compute)),
> > XE_RTP_ACTIONS(SET(HALF_SLICE_CHICKEN7, CLEAR_OPTIMIZATION_DISABLE))
> > },
> > diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules
> > b/drivers/gpu/drm/xe/xe_wa_oob.rules
> > index 9efc5accd43d..5c0d8b720946 100644
> > --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> > +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> > @@ -32,10 +32,10 @@
> > GRAPHICS_VERSION(3001)
> > 14022293748 GRAPHICS_VERSION(2001)
> > GRAPHICS_VERSION(2004)
> > - GRAPHICS_VERSION_RANGE(3000, 3001)
> > + GRAPHICS_VERSION_RANGE(3000, 3003)
> > 22019794406 GRAPHICS_VERSION(2001)
> > GRAPHICS_VERSION(2004)
> > - GRAPHICS_VERSION_RANGE(3000, 3001)
> > + GRAPHICS_VERSION_RANGE(3000, 3003)
> > 22019338487 MEDIA_VERSION(2000)
> > GRAPHICS_VERSION(2001)
> > MEDIA_VERSION(3000), MEDIA_STEP(A0, B0),
> > FUNC(xe_rtp_match_not_sriov_vf)
> > @@ -57,5 +57,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)
>
> Can we merge GRAPHICS_VERSION(3003) here into GRAPHICS_VERSION_RANGE(2001,
> 3001) above just like the other WAs?
It would probably be better to go the other direction and break out
30.03 on those other workarounds so that they aren't incorrectly
applying to 30.02 as well. We don't have any platforms using 30.02 at
the moment, but one could show up in the future and these workarounds
may or may not apply.
If we're sure a couple years down the road that no 30.02 is ever going
to materialize, we can come back and consolidate some of the entries to
help simplify. But for now we should try to follow the workaround
database exactly and not make assumptions about versions that don't
exist yet.
Matt
>
> Thanks,
> Sai Teja
>
> > +16026508708 GRAPHICS_VERSION_RANGE(1200, 3003)
> > MEDIA_VERSION_RANGE(1300, 3000)
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
