From: Ville Syrjälä Date: Tue, 19 May 2015 17:32:55 +0000 (+0300) Subject: drm/i915: Use ilk_init_lp_watermarks() on BDW X-Git-Tag: v4.2-rc1~33^2~34 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ad0dbab20678709ca268afa54189cf49b058f15;p=karo-tx-linux.git 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ä Reviewed-by: Jesse Barnes Signed-off-by: Daniel Vetter --- 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) struct drm_i915_private *dev_priv = dev->dev_private; enum pipe pipe; - I915_WRITE(WM3_LP_ILK, 0); - I915_WRITE(WM2_LP_ILK, 0); - I915_WRITE(WM1_LP_ILK, 0); + ilk_init_lp_watermarks(dev); /* WaSwitchSolVfFArbitrationPriority:bdw */ I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL);