diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index f4a4e9496893..f0d0dbab4150 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -124,7 +124,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *dev_priv) | |||
124 | 124 | ||
125 | static void glk_init_clock_gating(struct drm_i915_private *dev_priv) | 125 | static void glk_init_clock_gating(struct drm_i915_private *dev_priv) |
126 | { | 126 | { |
127 | u32 val; | ||
128 | gen9_init_clock_gating(dev_priv); | 127 | gen9_init_clock_gating(dev_priv); |
129 | 128 | ||
130 | /* | 129 | /* |
@@ -144,11 +143,6 @@ static void glk_init_clock_gating(struct drm_i915_private *dev_priv) | |||
144 | I915_WRITE(CHICKEN_MISC_2, val); | 143 | I915_WRITE(CHICKEN_MISC_2, val); |
145 | } | 144 | } |
146 | 145 | ||
147 | /* Display WA #1133: WaFbcSkipSegments:glk */ | ||
148 | val = I915_READ(ILK_DPFC_CHICKEN); | ||
149 | val &= ~GLK_SKIP_SEG_COUNT_MASK; | ||
150 | val |= GLK_SKIP_SEG_EN | GLK_SKIP_SEG_COUNT(1); | ||
151 | I915_WRITE(ILK_DPFC_CHICKEN, val); | ||
152 | } | 146 | } |
153 | 147 | ||
154 | static void i915_pineview_get_mem_freq(struct drm_i915_private *dev_priv) | 148 | static void i915_pineview_get_mem_freq(struct drm_i915_private *dev_priv) |
@@ -8517,7 +8511,6 @@ static void cnp_init_clock_gating(struct drm_i915_private *dev_priv) | |||
8517 | 8511 | ||
8518 | static void cnl_init_clock_gating(struct drm_i915_private *dev_priv) | 8512 | static void cnl_init_clock_gating(struct drm_i915_private *dev_priv) |
8519 | { | 8513 | { |
8520 | u32 val; | ||
8521 | cnp_init_clock_gating(dev_priv); | 8514 | cnp_init_clock_gating(dev_priv); |
8522 | 8515 | ||
8523 | /* This is not an Wa. Enable for better image quality */ | 8516 | /* This is not an Wa. Enable for better image quality */ |
@@ -8537,12 +8530,6 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv) | |||
8537 | I915_WRITE(SLICE_UNIT_LEVEL_CLKGATE, | 8530 | I915_WRITE(SLICE_UNIT_LEVEL_CLKGATE, |
8538 | I915_READ(SLICE_UNIT_LEVEL_CLKGATE) | | 8531 | I915_READ(SLICE_UNIT_LEVEL_CLKGATE) | |
8539 | SARBUNIT_CLKGATE_DIS); | 8532 | SARBUNIT_CLKGATE_DIS); |
8540 | |||
8541 | /* Display WA #1133: WaFbcSkipSegments:cnl */ | ||
8542 | val = I915_READ(ILK_DPFC_CHICKEN); | ||
8543 | val &= ~GLK_SKIP_SEG_COUNT_MASK; | ||
8544 | val |= GLK_SKIP_SEG_EN | GLK_SKIP_SEG_COUNT(1); | ||
8545 | I915_WRITE(ILK_DPFC_CHICKEN, val); | ||
8546 | } | 8533 | } |
8547 | 8534 | ||
8548 | static void cfl_init_clock_gating(struct drm_i915_private *dev_priv) | 8535 | static void cfl_init_clock_gating(struct drm_i915_private *dev_priv) |