From: Ville Syrjälä Date: Wed, 24 Jun 2015 19:00:10 +0000 (+0300) Subject: drm/i915: Zero unused WM1 watermarks on VLV/CHV X-Git-Tag: v4.14-rc1~2738^2~45^2~1854 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cb389b7e4966151d44c505d49ea31a8d6969372;p=platform%2Fkernel%2Flinux-rpi.git 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ä Reviewed-by: Clint Taylor Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 16ca34f..6eb5d76 100644 --- 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); }