drm/xe: Consolidate workaround entries for Wa_16021865536

Wa_16021865536 applies to both media versions 30.00 and 30.02; since
version 30.01 is currently unused we can 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-7-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 4009323da8021cf5791a96e119b7b71b64eb4431..092d46f48165d17b0ab4bf2a7e4550b97e137aad 100644 (file)
--- a/drivers/gpu/drm/xe/xe_wa.c
+++ b/drivers/gpu/drm/xe/xe_wa.c
@@ -267,13 +267,7 @@ static const struct xe_rtp_entry_sr gt_was[] = {
        /* Xe3_LPM */
 
        { XE_RTP_NAME("16021865536"),
-         XE_RTP_RULES(MEDIA_VERSION(3000),
-                      ENGINE_CLASS(VIDEO_DECODE)),
-         XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F10(0), IECPUNIT_CLKGATE_DIS)),
-         XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),
-       },
-       { XE_RTP_NAME("16021865536"),
-         XE_RTP_RULES(MEDIA_VERSION(3002),
+         XE_RTP_RULES(MEDIA_VERSION_RANGE(3000, 3002),
                       ENGINE_CLASS(VIDEO_DECODE)),
          XE_RTP_ACTIONS(SET(VDBOX_CGCTL3F10(0), IECPUNIT_CLKGATE_DIS)),
          XE_RTP_ENTRY_FLAG(FOREACH_ENGINE),