drm/i915/guc: Simplify/extend platform check for Wa_14018913170

The above w/a is required for every platform that the i915 driver
supports. It is fixed on the latest platforms but they are only
supported by Xe instead of i915. So just remove the platform check
completely and keep the code simple.

v2: Add extra comment (review feedback from Rodrigo).

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240223202846.1532176-1-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 2b450c43bbd7f1562986d41d1853dda0f4a95bd7..d2b7425bbdcc2bc94ec0d183cb27b0acc143d615 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -319,10 +319,12 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc)
        if (!RCS_MASK(gt))
                flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST;
 
-       /* Wa_14018913170 */
+       /*
+        * Wa_14018913170: Applicable to all platforms supported by i915 so
+        * don't bother testing for all X/Y/Z platforms explicitly.
+        */
        if (GUC_FIRMWARE_VER(guc) >= MAKE_GUC_VER(70, 7, 0)) {
-               if (IS_DG2(gt->i915) || IS_METEORLAKE(gt->i915) || IS_PONTEVECCHIO(gt->i915))
-                       flags |= GUC_WA_ENABLE_TSC_CHECK_ON_RC6;
+               flags |= GUC_WA_ENABLE_TSC_CHECK_ON_RC6;
        }
 
        return flags;