diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2009-02-11 15:22:28 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-11 09:08:47 +0100 |
| commit | a1667e4eea0a7085815d1532d7630bb4611271d0 (patch) | |
| tree | 3e953fee709e0c41bf6fa1496cab025700e865d0 /sound | |
| parent | 44a678d04babaa751c0ee98e006ede9576fa9e00 (diff) | |
| download | linux-stable-a1667e4eea0a7085815d1532d7630bb4611271d0.tar.gz linux-stable-a1667e4eea0a7085815d1532d7630bb4611271d0.tar.bz2 linux-stable-a1667e4eea0a7085815d1532d7630bb4611271d0.zip | |
ALSA: hda - allow multi-channel HDMI audio playback when ELD is not present
The YAMAHA AV-X1800 requires audio infoframe to include speaker-channel
mapping to play >2 channel HDMI audio. In theory that mapping should be
derived from its speaker configurations contained in its ELD. However we
currently cannot get ELD in console before the KMS functionalities are ready.
This is a more or less general issue at least in the near future. As a
workaround, we propose to allow playback of mult-channel audio when ELD
is not available.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_intelhdmi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c index 3564f4e4b74c..a8643509e2af 100644 --- a/sound/pci/hda/patch_intelhdmi.c +++ b/sound/pci/hda/patch_intelhdmi.c @@ -419,14 +419,18 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec, /* * CA defaults to 0 for basic stereo audio */ - if (!eld->eld_ver) - return 0; - if (!eld->spk_alloc) - return 0; if (channels <= 2) return 0; /* + * HDMI sink's ELD info cannot always be retrieved for now, e.g. + * in console or for audio devices. Assume the highest speakers + * configuration, to _not_ prohibit multi-channel audio playback. + */ + if (!eld->spk_alloc) + eld->spk_alloc = 0xffff; + + /* * expand ELD's speaker allocation mask * * ELD tells the speaker mask in a compact(paired) form, |