---

yaml --- r: 318617 b: refs/heads/master c: bd9e841 h: refs/heads/master i: 318615: 5a511f4 v: v3
git-mirror · Jun 20, 2012 · 8cad22a · 8cad22a
1 parent e7d6b22
commit 8cad22a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;