diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2010-04-07 04:15:57 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-04-12 12:23:43 -0400 |
commit | 0f229062a13204120dcd23168ad008e559bb1376 (patch) | |
tree | 087f75e3851dc1f1d49c052448a44fe7c0098af5 /drivers/gpu/drm/i915 | |
parent | b3b095b3b2b052f3c665b0d9e3e551fb65062db3 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 78cb775be4d7..5ff580219834 100644 --- 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, | |||
61 | if (hdmi_priv->has_hdmi_sink) | 61 | if (hdmi_priv->has_hdmi_sink) |
62 | sdvox |= SDVO_AUDIO_ENABLE; | 62 | sdvox |= SDVO_AUDIO_ENABLE; |
63 | 63 | ||
64 | if (intel_crtc->pipe == 1) | 64 | if (intel_crtc->pipe == 1) { |
65 | sdvox |= SDVO_PIPE_B_SELECT; | 65 | if (HAS_PCH_CPT(dev)) |
66 | sdvox |= PORT_TRANS_B_SEL_CPT; | ||
67 | else | ||
68 | sdvox |= SDVO_PIPE_B_SELECT; | ||
69 | } | ||
66 | 70 | ||
67 | I915_WRITE(hdmi_priv->sdvox_reg, sdvox); | 71 | I915_WRITE(hdmi_priv->sdvox_reg, sdvox); |
68 | POSTING_READ(hdmi_priv->sdvox_reg); | 72 | POSTING_READ(hdmi_priv->sdvox_reg); |