drm/xe: Consolidate workaround entries for Wa_18032247524

Wa_18032247524 applies to all graphics versions from 20.01 through 20.04
(inclusive).  Consolidate the two RTP entries into a single range-based
entry.

Reviewed-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Link: https://patch.msgid.link/20260220-forupstream-wa_cleanup-v2-8-b12005a05af6@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
index 092d46f48165d17b0ab4bf2a7e4550b97e137aad..a483a76c7665eba1c6a87a18bab1a31d11a01f4d 100644 (file)
--- a/drivers/gpu/drm/xe/xe_wa.c
+++ b/drivers/gpu/drm/xe/xe_wa.c
@@ -306,6 +306,8 @@ static const struct xe_rtp_entry_sr gt_was[] = {
 };
 
 static const struct xe_rtp_entry_sr engine_was[] = {
+       /* Workarounds applying over a range of IPs */
+
        { XE_RTP_NAME("22010931296, 18011464164, 14010919138"),
          XE_RTP_RULES(GRAPHICS_VERSION(1200), ENGINE_CLASS(RENDER)),
          XE_RTP_ACTIONS(SET(FF_THREAD_MODE(RENDER_RING_BASE),
@@ -341,6 +343,11 @@ static const struct xe_rtp_entry_sr engine_was[] = {
          XE_RTP_ACTIONS(SET(FF_SLICE_CS_CHICKEN1(RENDER_RING_BASE),
                             FFSC_PERCTX_PREEMPT_CTRL))
        },
+       { XE_RTP_NAME("18032247524"),
+         XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2004),
+                      FUNC(xe_rtp_match_first_render_or_compute)),
+         XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0, SEQUENTIAL_ACCESS_UPGRADE_DISABLE))
+       },
 
        /* TGL */
 
@@ -478,11 +485,6 @@ static const struct xe_rtp_entry_sr engine_was[] = {
 
        /* Xe2_LPG */
 
-       { XE_RTP_NAME("18032247524"),
-         XE_RTP_RULES(GRAPHICS_VERSION(2004),
-                      FUNC(xe_rtp_match_first_render_or_compute)),
-         XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0, SEQUENTIAL_ACCESS_UPGRADE_DISABLE))
-       },
        { XE_RTP_NAME("16018712365"),
          XE_RTP_RULES(GRAPHICS_VERSION(2004), FUNC(xe_rtp_match_first_render_or_compute)),
          XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0_UDW, XE2_ALLOC_DPA_STARVE_FIX_DIS))
@@ -551,11 +553,6 @@ static const struct xe_rtp_entry_sr engine_was[] = {
                       FUNC(xe_rtp_match_first_render_or_compute)),
          XE_RTP_ACTIONS(SET(ROW_CHICKEN3, XE2_EUPEND_CHK_FLUSH_DIS))
        },
-       { XE_RTP_NAME("18032247524"),
-         XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
-                      FUNC(xe_rtp_match_first_render_or_compute)),
-         XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0, SEQUENTIAL_ACCESS_UPGRADE_DISABLE))
-       },
        { XE_RTP_NAME("14018471104"),
          XE_RTP_RULES(GRAPHICS_VERSION_RANGE(2001, 2002),
                       FUNC(xe_rtp_match_first_render_or_compute)),