Skip to content

Commit 4ae86a7

Browse files
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 <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 6ee3f54 commit 4ae86a7

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/gpu/drm/i915/gt/uc/intel_guc.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,12 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc)
319319
if (!RCS_MASK(gt))
320320
flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST;
321321

322-
/* Wa_14018913170 */
322+
/*
323+
* Wa_14018913170: Applicable to all platforms supported by i915 so
324+
* don't bother testing for all X/Y/Z platforms explicitly.
325+
*/
323326
if (GUC_FIRMWARE_VER(guc) >= MAKE_GUC_VER(70, 7, 0)) {
324-
if (IS_DG2(gt->i915) || IS_METEORLAKE(gt->i915) || IS_PONTEVECCHIO(gt->i915))
325-
flags |= GUC_WA_ENABLE_TSC_CHECK_ON_RC6;
327+
flags |= GUC_WA_ENABLE_TSC_CHECK_ON_RC6;
326328
}
327329

328330
return flags;

0 commit comments

Comments
 (0)