diff options
| author | Ville Syrjälä | 2015-06-24 21:00:10 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-06-29 11:00:11 +0200 |
| commit | 2cb389b7e4966151d44c505d49ea31a8d6969372 (patch) | |
| tree | 5fb6cbef495ad1d582cc72b0a1edfd03d2e05bc8 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: Add debugfs knobs for VLVCHV memory latency values (diff) | |
| download | kernel-qcow2-linux-2cb389b7e4966151d44c505d49ea31a8d6969372.tar.gz kernel-qcow2-linux-2cb389b7e4966151d44c505d49ea31a8d6969372.tar.xz kernel-qcow2-linux-2cb389b7e4966151d44c505d49ea31a8d6969372.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 16ca34fb5380..6eb5d76e6912 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); } |