summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-27 10:21:40 +0200
committerKeith Packard <keithp@keithp.com>2011-07-29 01:27:39 +0200
commit120eced9efe7fdb5123db4ea47e9adee9b66284e (patch)
treebedbd38ac1e7da9c6c5bf1a37afebb0bf7e327d1
parentRevert and fix "drm/i915/dp: remove DPMS mode tracking from DP" (diff)
downloadlinux-120eced9efe7fdb5123db4ea47e9adee9b66284e.tar.xz
linux-120eced9efe7fdb5123db4ea47e9adee9b66284e.zip
drm/i915: Set crtc DPMS mode to ON in intel_crtc_mode_set
This corrects the DPMS mode tracking so that the DPMS code will actually turn the CRTC off the next time the screen saves. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index fc26cb4c9ba3..d9b8c15998d9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5273,6 +5273,8 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
drm_vblank_post_modeset(dev, pipe);
+ intel_crtc->dpms_mode = DRM_MODE_DPMS_ON;
+
return ret;
}