|
@@ -8263,6 +8263,23 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,
|
|
|
I915_WRITE(GEN7_MISCCPCTL, misccpctl);
|
|
|
}
|
|
|
|
|
|
+static void cannonlake_init_clock_gating(struct drm_i915_private *dev_priv)
|
|
|
+{
|
|
|
+ /* WaEnableChickenDCPR:cnl */
|
|
|
+ I915_WRITE(GEN8_CHICKEN_DCPR_1,
|
|
|
+ I915_READ(GEN8_CHICKEN_DCPR_1) | MASK_WAKEMEM);
|
|
|
+
|
|
|
+ /* WaFbcWakeMemOn:cnl */
|
|
|
+ I915_WRITE(DISP_ARB_CTL, I915_READ(DISP_ARB_CTL) |
|
|
|
+ DISP_FBC_MEMORY_WAKE);
|
|
|
+
|
|
|
+ /* WaSarbUnitClockGatingDisable:cnl (pre-prod) */
|
|
|
+ if (IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_B0))
|
|
|
+ I915_WRITE(SLICE_UNIT_LEVEL_CLKGATE,
|
|
|
+ I915_READ(SLICE_UNIT_LEVEL_CLKGATE) |
|
|
|
+ SARBUNIT_CLKGATE_DIS);
|
|
|
+}
|
|
|
+
|
|
|
static void kabylake_init_clock_gating(struct drm_i915_private *dev_priv)
|
|
|
{
|
|
|
gen9_init_clock_gating(dev_priv);
|
|
@@ -8743,7 +8760,9 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)
|
|
|
*/
|
|
|
void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
|
|
|
{
|
|
|
- if (IS_SKYLAKE(dev_priv))
|
|
|
+ if (IS_CANNONLAKE(dev_priv))
|
|
|
+ dev_priv->display.init_clock_gating = cannonlake_init_clock_gating;
|
|
|
+ else if (IS_SKYLAKE(dev_priv))
|
|
|
dev_priv->display.init_clock_gating = skylake_init_clock_gating;
|
|
|
else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))
|
|
|
dev_priv->display.init_clock_gating = kabylake_init_clock_gating;
|