diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-10-19 18:37:32 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-10-23 14:31:18 -0400 |
commit | 629598da932cfa5ff398fe10bc123282a6f3049e (patch) | |
tree | 76c088fea8b45aa63291f8eb5c1d3519d528170d | |
parent | 0e442c60dd39ac6924b11a20497734bd2303744c (diff) |
drm/i915: update watermarks before enabling PLLs
When coming back from DPMS or turning on a display, make sure we have
the watermarks set up before turning on the display plane, otherwise we
may get underruns.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Tested-by: Dirk Hohndel <hohndel@infradead.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 47d6ff058991..7eed3db5451d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -1803,6 +1803,8 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
1803 | case DRM_MODE_DPMS_ON: | 1803 | case DRM_MODE_DPMS_ON: |
1804 | case DRM_MODE_DPMS_STANDBY: | 1804 | case DRM_MODE_DPMS_STANDBY: |
1805 | case DRM_MODE_DPMS_SUSPEND: | 1805 | case DRM_MODE_DPMS_SUSPEND: |
1806 | intel_update_watermarks(dev); | ||
1807 | |||
1806 | /* Enable the DPLL */ | 1808 | /* Enable the DPLL */ |
1807 | temp = I915_READ(dpll_reg); | 1809 | temp = I915_READ(dpll_reg); |
1808 | if ((temp & DPLL_VCO_ENABLE) == 0) { | 1810 | if ((temp & DPLL_VCO_ENABLE) == 0) { |
@@ -1840,7 +1842,6 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
1840 | 1842 | ||
1841 | /* Give the overlay scaler a chance to enable if it's on this pipe */ | 1843 | /* Give the overlay scaler a chance to enable if it's on this pipe */ |
1842 | //intel_crtc_dpms_video(crtc, true); TODO | 1844 | //intel_crtc_dpms_video(crtc, true); TODO |
1843 | intel_update_watermarks(dev); | ||
1844 | break; | 1845 | break; |
1845 | case DRM_MODE_DPMS_OFF: | 1846 | case DRM_MODE_DPMS_OFF: |
1846 | intel_update_watermarks(dev); | 1847 | intel_update_watermarks(dev); |