diff options
| author | Zhenyu Wang | 2010-05-12 05:02:14 +0200 |
|---|---|---|
| committer | Eric Anholt | 2010-05-26 23:14:52 +0200 |
| commit | 467b200da78c56036e58850a7f27902937d506f7 (patch) | |
| tree | 91be91afd6df4c96a901c1a2575df376ec2bcc5d /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915: combine all small integers into one single bitfield (diff) | |
| download | kernel-qcow2-linux-467b200da78c56036e58850a7f27902937d506f7.tar.gz kernel-qcow2-linux-467b200da78c56036e58850a7f27902937d506f7.tar.xz kernel-qcow2-linux-467b200da78c56036e58850a7f27902937d506f7.zip | |
drm/i915: Fix HDMI mode select for Cougarpoint PCH
For real HDMI sink, CPT HDMI port has to set 'HDMI' mode flag
in order to make HDMI audio work correctly.
This is required patch for drm/i915 to enable HDMI audio on CPT PCH,
ALSA patch is at http://mailman.alsa-project.org/pipermail/alsa-devel/2010-May/027601.html
Tested-by: Fengguang Wu <fengguang.wu@intel.com>
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 65727f0a79a3..83bd764b000e 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -59,8 +59,11 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder, SDVO_VSYNC_ACTIVE_HIGH | SDVO_HSYNC_ACTIVE_HIGH; - if (hdmi_priv->has_hdmi_sink) + if (hdmi_priv->has_hdmi_sink) { sdvox |= SDVO_AUDIO_ENABLE; + if (HAS_PCH_CPT(dev)) + sdvox |= HDMI_MODE_SELECT; + } if (intel_crtc->pipe == 1) { if (HAS_PCH_CPT(dev)) |