summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorWu Fengguang2009-10-30 11:40:03 +0100
committerTakashi Iwai2009-10-30 11:40:03 +0100
commit92608badc519a8c1f65d93743396517aaa582b53 (patch)
tree6dae736c79c8593f7629840870d9fbc77cf46a0a /sound
parentALSA: hda - vectorize get_empty_pcm_device() (diff)
downloadkernel-qcow2-linux-92608badc519a8c1f65d93743396517aaa582b53.tar.gz
kernel-qcow2-linux-92608badc519a8c1f65d93743396517aaa582b53.tar.xz
kernel-qcow2-linux-92608badc519a8c1f65d93743396517aaa582b53.zip
ALSA: hda - allow up to 4 HDMI devices
The new Intel HDMI codec supports 2 independant HDMI/DisplayPort pipes. We'll be exporting them as 2 pcm devices. So bump up the allowed number of HDMI devices. 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/hda_codec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 49289cd50697..2c1366343335 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2889,7 +2889,7 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type)
static int audio_idx[HDA_PCM_NTYPES][5] = {
[HDA_PCM_TYPE_AUDIO] = { 0, 2, 4, 5, -1 },
[HDA_PCM_TYPE_SPDIF] = { 1, -1 },
- [HDA_PCM_TYPE_HDMI] = { 3, -1 },
+ [HDA_PCM_TYPE_HDMI] = { 3, 7, 8, 9, -1 },
[HDA_PCM_TYPE_MODEM] = { 6, -1 },
};
int i;