drm/i915: enable HDMI on Cougarpoint

Fix transcoder select bit for HDMI on CPT.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 78cb775be4d7d6daea030790a58e51f0d45ea0f8..5ff580219834ce3ad4c1e59db1e6b034e6832ecb 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -61,8 +61,12 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,
        if (hdmi_priv->has_hdmi_sink)
                sdvox |= SDVO_AUDIO_ENABLE;
 
-       if (intel_crtc->pipe == 1)
-               sdvox |= SDVO_PIPE_B_SELECT;
+       if (intel_crtc->pipe == 1) {
+               if (HAS_PCH_CPT(dev))
+                       sdvox |= PORT_TRANS_B_SEL_CPT;
+               else
+                       sdvox |= SDVO_PIPE_B_SELECT;
+       }
 
        I915_WRITE(hdmi_priv->sdvox_reg, sdvox);
        POSTING_READ(hdmi_priv->sdvox_reg);