From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed, 2 Apr 2014 17:08:53 +0000 (-0700)
Subject: drm/i915: enable HDMI mode on VLV when an HDMI sink is detected
X-Git-Tag: next-20140428~44^2~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=759c85e778f4f99f2f7eaa599c57b0c0ada97d08;p=karo-tx-linux.git

drm/i915: enable HDMI mode on VLV when an HDMI sink is detected

Allows sending of the null packets for conformance.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 3b804fcb1672..fb9839b0effa 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -650,8 +650,8 @@ static void intel_hdmi_mode_set(struct intel_encoder *encoder)
 	else
 		hdmi_val |= SDVO_COLOR_FORMAT_8bpc;
 
-	/* Required on CPT */
-	if (intel_hdmi->has_hdmi_sink && HAS_PCH_CPT(dev))
+	if (intel_hdmi->has_hdmi_sink &&
+	    (HAS_PCH_CPT(dev) || IS_VALLEYVIEW(dev)))
 		hdmi_val |= HDMI_MODE_SELECT_HDMI;
 
 	if (intel_hdmi->has_audio) {