From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 15 Jun 2012 18:55:18 +0000 (-0700)
Subject: drm/i915: VLV VGA port only handles on & off, like PCH VGA
X-Git-Tag: MMI-PSA29.97-13-9~16260^2~42^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd9e8413c9bdfc36b5b8ce6ed86843d157c17099;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/i915: VLV VGA port only handles on & off, like PCH VGA

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 71b412a6fbd5..61d55d3141c7 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/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;