From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Thu, 5 Dec 2013 13:51:37 +0000 (+0200)
Subject: drm/i915: Disable LP1+ watermarks safely in init
X-Git-Tag: v3.14-rc1~47^2~16^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017636cc09e2c58bc493cc1fe74d858f50d173af;p=pandora-kernel.git

drm/i915: Disable LP1+ watermarks safely in init

ILK doesn't like if we just write the LP1+ watermarks registers with 0.
We need to just disable the watermarks by clearing the enable bit. Use
that method also when disabling LP1+ watermarks in init_clock_gating.

It looks like disabling the sprite LP1 watermarks can cause underruns
even if we just toggle the WM1S_LP_EN bit. So treat that bit like the
actual watermark numbers and avoid setting it to 0 immediately.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed