From 8cad22af67a8587913062f7132bb5aff6ec53296 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 15 Jun 2012 11:55:18 -0700
Subject: [PATCH] --- yaml --- r: 318617 b: refs/heads/master c:
 bd9e8413c9bdfc36b5b8ce6ed86843d157c17099 h: refs/heads/master i:   318615:
 5a511f49f4a284427c35822a4ad7dc20df91b0a0 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/i915/intel_crt.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b833a5e70aea..35d889a87bbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7dff0c9cbb89e9c406c0ca47f32129b61721174
+refs/heads/master: bd9e8413c9bdfc36b5b8ce6ed86843d157c17099
diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/drivers/gpu/drm/i915/intel_crt.c
index 71b412a6fbd5..61d55d3141c7 100644
--- a/trunk/drivers/gpu/drm/i915/intel_crt.c
+++ b/trunk/drivers/gpu/drm/i915/intel_crt.c
@@ -88,6 +88,9 @@ static void gmch_crt_dpms(struct drm_encoder *encoder, int mode)
 	temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
 	temp &= ~ADPA_DAC_ENABLE;
 
+	if (IS_VALLEYVIEW(dev) && mode != DRM_MODE_DPMS_ON)
+		mode = DRM_MODE_DPMS_OFF;
+
 	switch (mode) {
 	case DRM_MODE_DPMS_ON:
 		temp |= ADPA_DAC_ENABLE;