drm/xe/xelpg: Extend some workarounds to graphics version 12.74

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@intel.com>
Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240229070806.3402641-3-dnyaneshwar.bhadane@intel.com

diff --git a/drivers/gpu/drm/xe/tests/xe_wa_test.c b/drivers/gpu/drm/xe/tests/xe_wa_test.c
index 44570d888355fac9b5a3949bbc17b081b0499363..9d0c715142b9b1c4c3218d15439426cf7c15afa9 100644 (file)
--- 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 a0264eedd443e2754c7d626e8f0eb660101e517e..bcc285f45a1ebfb4e4792d08f5a6025c29178055 100644 (file)
--- 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"),