drm/xe/xelp: Move Wa_16011163337 from tunings to workarounds

[ Upstream commit d9b5d83c5a4d720af6ddbefe2825c78f0325a3fd ]

Workaround database specifies 16011163337 as a workaround so lets move it
there.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Gustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250227101304.46660-3-tvrtko.ursulin@igalia.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/xe/xe_tuning.c b/drivers/gpu/drm/xe/xe_tuning.c
index 0d5e04158917be78b48c06f5eafc96b10ce1c59f..1fb12da21c9e4cf04a86157a22d101703ac7ec62 100644 (file)
--- a/drivers/gpu/drm/xe/xe_tuning.c
+++ b/drivers/gpu/drm/xe/xe_tuning.c
@@ -97,14 +97,6 @@ static const struct xe_rtp_entry_sr engine_tunings[] = {
 };
 
 static const struct xe_rtp_entry_sr lrc_tunings[] = {
-       { XE_RTP_NAME("Tuning: ganged timer, also known as 16011163337"),
-         XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)),
-         /* read verification is ignored due to 1608008084. */
-         XE_RTP_ACTIONS(FIELD_SET_NO_READ_MASK(FF_MODE2,
-                                               FF_MODE2_GS_TIMER_MASK,
-                                               FF_MODE2_GS_TIMER_224))
-       },
-
        /* DG2 */
 
        { XE_RTP_NAME("Tuning: L3 cache"),

diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
index 37e592b2bf062ac87d895e6b2bed7e6dc1986e1f..0a1905f8d380a87f8b1629db1f02737e19405f90 100644 (file)
--- a/drivers/gpu/drm/xe/xe_wa.c
+++ b/drivers/gpu/drm/xe/xe_wa.c
@@ -606,6 +606,13 @@ static const struct xe_rtp_entry_sr engine_was[] = {
 };
 
 static const struct xe_rtp_entry_sr lrc_was[] = {
+       { XE_RTP_NAME("16011163337"),
+         XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)),
+         /* read verification is ignored due to 1608008084. */
+         XE_RTP_ACTIONS(FIELD_SET_NO_READ_MASK(FF_MODE2,
+                                               FF_MODE2_GS_TIMER_MASK,
+                                               FF_MODE2_GS_TIMER_224))
+       },
        { XE_RTP_NAME("1409342910, 14010698770, 14010443199, 1408979724, 1409178076, 1409207793, 1409217633, 1409252684, 1409347922, 1409142259"),
          XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210)),
          XE_RTP_ACTIONS(SET(COMMON_SLICE_CHICKEN3,