summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2013-09-23 00:41:50 +0300
committerTakashi Iwai <tiwai@suse.de>2013-09-26 12:01:33 +0200
commit383912ef83cb2d5835239a23f6afc6198697a587 (patch)
tree526990c39c4ae449b65aec162181d22667f53472
parent23bf1dce9438c0cf74357928289aa8f06957c283 (diff)
downloadalsa-lib-383912ef83cb2d5835239a23f6afc6198697a587.tar.gz
HDA-Intel: present up to 8 HDMI/DP outputs via "hdmi" device
Some new AMD cards have HDA codecs presenting 6 connected HDMI/DP pin nodes (plus 1 unconnected pin node) according to the ALSA card database. Example: http://www.alsa-project.org/db/?f=de3ced7af41de0ed54d218650e5e2f16c511787b Bump the maximum number of presented HDMI outputs per card via the "hdmi" PCM from 4 to 8 (so that the last possible device is DEV=7). Note that HDMI PCM devices DEV=4..7 use shared PCM device numbers, so HDA cards that have over 4 audio PCM devices or multiple S/PDIF or modem devices will have their remaining PCM devices misrepresented as HDMI devices. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--src/conf/cards/HDA-Intel.conf92
1 files changed, 92 insertions, 0 deletions
diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf
index 3957c124..7976b6c5 100644
--- a/src/conf/cards/HDA-Intel.conf
+++ b/src/conf/cards/HDA-Intel.conf
@@ -305,6 +305,98 @@ HDA-Intel.pcm.hdmi.3 {
}
}
+HDA-Intel.pcm.hdmi.4 {
+ @args [ CARD AES0 AES1 AES2 AES3 ]
+ @args.CARD { type string }
+ @args.AES0 { type integer }
+ @args.AES1 { type integer }
+ @args.AES2 { type integer }
+ @args.AES3 { type integer }
+ @func refer
+ name {
+ @func concat
+ strings [
+ "cards.HDA-Intel.pcm.hdmi.common:"
+ "CARD=" $CARD ","
+ "DEVICE=10,"
+ "CTLINDEX=4,"
+ "AES0=" $AES0 ","
+ "AES1=" $AES1 ","
+ "AES2=" $AES2 ","
+ "AES3=" $AES3
+ ]
+ }
+}
+
+HDA-Intel.pcm.hdmi.5 {
+ @args [ CARD AES0 AES1 AES2 AES3 ]
+ @args.CARD { type string }
+ @args.AES0 { type integer }
+ @args.AES1 { type integer }
+ @args.AES2 { type integer }
+ @args.AES3 { type integer }
+ @func refer
+ name {
+ @func concat
+ strings [
+ "cards.HDA-Intel.pcm.hdmi.common:"
+ "CARD=" $CARD ","
+ "DEVICE=11,"
+ "CTLINDEX=5,"
+ "AES0=" $AES0 ","
+ "AES1=" $AES1 ","
+ "AES2=" $AES2 ","
+ "AES3=" $AES3
+ ]
+ }
+}
+
+HDA-Intel.pcm.hdmi.6 {
+ @args [ CARD AES0 AES1 AES2 AES3 ]
+ @args.CARD { type string }
+ @args.AES0 { type integer }
+ @args.AES1 { type integer }
+ @args.AES2 { type integer }
+ @args.AES3 { type integer }
+ @func refer
+ name {
+ @func concat
+ strings [
+ "cards.HDA-Intel.pcm.hdmi.common:"
+ "CARD=" $CARD ","
+ "DEVICE=12,"
+ "CTLINDEX=6,"
+ "AES0=" $AES0 ","
+ "AES1=" $AES1 ","
+ "AES2=" $AES2 ","
+ "AES3=" $AES3
+ ]
+ }
+}
+
+HDA-Intel.pcm.hdmi.7 {
+ @args [ CARD AES0 AES1 AES2 AES3 ]
+ @args.CARD { type string }
+ @args.AES0 { type integer }
+ @args.AES1 { type integer }
+ @args.AES2 { type integer }
+ @args.AES3 { type integer }
+ @func refer
+ name {
+ @func concat
+ strings [
+ "cards.HDA-Intel.pcm.hdmi.common:"
+ "CARD=" $CARD ","
+ "DEVICE=13,"
+ "CTLINDEX=7,"
+ "AES0=" $AES0 ","
+ "AES1=" $AES1 ","
+ "AES2=" $AES2 ","
+ "AES3=" $AES3
+ ]
+ }
+}
+
<confdir:pcm/modem.conf>
HDA-Intel.pcm.modem.0 {