drm/i915: Zero unused WM1 watermarks on VLV/CHV

The hardware supposedly ignores the WM1 watermarks while the PND
deadline mode is enabled, but clear out the register just in case.
This is what the other OS does, and it does make register dumps look
more consistent when we don't have partial WM1 values lingering in
the registers (some WM1 watermarks already get zeroed when the actually
used DSPFW registers get written).

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 16ca34fb5380dba0f860ba6e9310225abf77f19c..6eb5d76e691203333407b9f0846914566a04ccf3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -927,6 +927,12 @@ static void vlv_write_wm_values(struct intel_crtc *crtc,
                           FW_WM(wm->pipe[PIPE_A].primary >> 8, PLANEA_HI));
        }
 
+       /* zero (unused) WM1 watermarks */
+       I915_WRITE(DSPFW4, 0);
+       I915_WRITE(DSPFW5, 0);
+       I915_WRITE(DSPFW6, 0);
+       I915_WRITE(DSPHOWM1, 0);
+
        POSTING_READ(DSPFW1);
 }