diff options
| author |   Zhenyu Wang <zhenyuw@linux.intel.com> | 2010-04-07 16:15:57 +0800 |
|---|---|---|
| committer |   Eric Anholt <eric@anholt.net> | 2010-04-12 09:23:43 -0700 |
| commit | 0f229062a13204120dcd23168ad008e559bb1376 (patch) | |
| tree | 087f75e3851dc1f1d49c052448a44fe7c0098af5 /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915: enable LVDS on Cougarpoint (diff) | |
| download | linux-dev-0f229062a13204120dcd23168ad008e559bb1376.tar.xz linux-dev-0f229062a13204120dcd23168ad008e559bb1376.zip | |
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/intel_hdmi.c')
| -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, 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); |