aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-05-19 13:32:55 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-05-22 02:07:39 -0400
commit7ad0dbab20678709ca268afa54189cf49b058f15 (patch)
tree0fde51a4a97246ff84c701bd98c86aa9d8894910 /drivers/gpu/drm/i915/intel_pm.c
parent5a74f70a733fc79a37ee8462ae59de6897d17eed (diff)
drm/i915: Use ilk_init_lp_watermarks() on BDW
We're not using ilk_init_lp_watermarks() on BDW for some reason. Probably due to the BDW patches and the relevant WM patches landing roughlly at the same time. Fix it up. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 6414b27692d4..cfc748086088 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6175,9 +6175,7 @@ static void broadwell_init_clock_gating(struct drm_device *dev)
6175 struct drm_i915_private *dev_priv = dev->dev_private; 6175 struct drm_i915_private *dev_priv = dev->dev_private;
6176 enum pipe pipe; 6176 enum pipe pipe;
6177 6177
6178 I915_WRITE(WM3_LP_ILK, 0); 6178 ilk_init_lp_watermarks(dev);
6179 I915_WRITE(WM2_LP_ILK, 0);
6180 I915_WRITE(WM1_LP_ILK, 0);
6181 6179
6182 /* WaSwitchSolVfFArbitrationPriority:bdw */ 6180 /* WaSwitchSolVfFArbitrationPriority:bdw */
6183 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL); 6181 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL);