diff options
| author | Wu Fengguang <wfg@linux.intel.com> | 2008-11-07 14:23:40 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-11-13 09:51:17 +0800 |
| commit | 42b3903c3fda95a7c536cb957d8163d8dc54a9a1 (patch) | |
| tree | 7ec7f5f3abfca4704d72c51b3b71c401cfcbf3c5 /src | |
| parent | 293f4a8b6d1ca8a47d14c4d4b5904b85a8167e12 (diff) | |
enable Intel G45 integrated HDMI audio output
Enable audio output for the integrated HDMI of Intel G45 chipset
by introducing the SDVO_AUDIO_ENABLE bit.
Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/i810_reg.h | 1 | ||||
| -rw-r--r-- | src/i830_hdmi.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/i810_reg.h b/src/i810_reg.h index b391d55d..e2ffba1f 100644 --- a/src/i810_reg.h +++ b/src/i810_reg.h @@ -1296,6 +1296,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /** Requird for HDMI operation */ #define SDVO_NULL_PACKETS_DURING_VSYNC (1 << 9) #define SDVO_BORDER_ENABLE (1 << 7) +#define SDVO_AUDIO_ENABLE (1 << 6) /** New with 965, default is to be set */ #define SDVO_VSYNC_ACTIVE_HIGH (1 << 4) /** New with 965, default is to be set */ diff --git a/src/i830_hdmi.c b/src/i830_hdmi.c index a3e3ba8e..05aa9acf 100644 --- a/src/i830_hdmi.c +++ b/src/i830_hdmi.c @@ -80,6 +80,10 @@ i830_hdmi_mode_set(xf86OutputPtr output, DisplayModePtr mode, SDVO_BORDER_ENABLE | SDVO_VSYNC_ACTIVE_HIGH | SDVO_HSYNC_ACTIVE_HIGH; + + if (dev_priv->has_hdmi_sink) + sdvox |= SDVO_AUDIO_ENABLE; + if (intel_crtc->pipe == 1) sdvox |= SDVO_PIPE_B_SELECT; |