Skip to content

Commit ce69e55

Browse files
icklejlahtine-intel
authored andcommitted
drm/i915/gt: Restore coarse power gating
The coarse power gating was disabled as part of commit 2248a28 ("drm/i915/gen8+: Add RC6 CTX corruption WA") as a prelude to recover from the context corruption; the power gating itself has no direct impact on the RC6 context corruption. However, that recovery scheme was never implemented due to difficult corner cases, and so we no longer need to keep the power gating disabled. Fixes: 2248a28 ("drm/i915/gen8+: Add RC6 CTX corruption WA") Closes: https://gitlab.freedesktop.org/drm/intel/issues/846 Signed-off-by: Chris Wilson <[email protected]> Cc: Imre Deak <[email protected]> Cc: Mika Kuoppala <[email protected]> Cc: Eero Tamminen <[email protected]> Cc: Jon Bloomfield <[email protected]> Reviewed-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 32f408a) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 1033099 commit ce69e55

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,8 +1660,10 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
16601660
(IS_BROADWELL(dev_priv) || IS_GEN(dev_priv, 9))
16611661

16621662
/* WaRsDisableCoarsePowerGating:skl,cnl */
1663-
#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \
1664-
(IS_CANNONLAKE(dev_priv) || IS_GEN(dev_priv, 9))
1663+
#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \
1664+
(IS_CANNONLAKE(dev_priv) || \
1665+
IS_SKL_GT3(dev_priv) || \
1666+
IS_SKL_GT4(dev_priv))
16651667

16661668
#define HAS_GMBUS_IRQ(dev_priv) (INTEL_GEN(dev_priv) >= 4)
16671669
#define HAS_GMBUS_BURST_READ(dev_priv) (INTEL_GEN(dev_priv) >= 10 || \

0 commit comments

Comments
 (0)