drm/xe/xe3: Add support for graphics IP versions 30.04 & 30.05

Add graphics IP versions 30.04 & 30.05 and initial workarounds for these
IP versions.

BSpec: 74201
Signed-off-by: Shekhar Chauhan <shekhar.chauhan@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20251016-xe3p-v3-1-3dd173a3097a@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 0f1a06b62e03f8e1dd80452d52f048cf063aa116..9744c572b1bdd3b4dae5dec92641ac6ddfffc8e4 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -136,6 +136,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 aa1b69f48f6f9f323bfd7a9453b2930b1b03fee9..b6dcd9827354d4880cbff3c7558330f784a3b843 100644 (file)
--- 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 4bb94e5799ed64f3f2d1d91559f333e1367f1a33..fb38eb3d6e9a3bf6e9c39ae972640d98792c924e 100644 (file)
--- a/drivers/gpu/drm/xe/xe_wa_oob.rules
+++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
@@ -33,14 +33,15 @@
 13011645652    GRAPHICS_VERSION(2004)
                GRAPHICS_VERSION_RANGE(3000, 3001)
                GRAPHICS_VERSION(3003)
+               GRAPHICS_VERSION_RANGE(3004, 3005)
 14022293748    GRAPHICS_VERSION_RANGE(2001, 2002)
                GRAPHICS_VERSION(2004)
-               GRAPHICS_VERSION_RANGE(3000, 3001)
-               GRAPHICS_VERSION(3003)
+               GRAPHICS_VERSION_RANGE(3000, 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)
@@ -61,11 +62,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)