From 88ff72cf9f620be04a328bd91f2286b9b292f62e Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Tue, 4 Jun 2024 14:06:47 +0200 Subject: [PATCH] ucm2: Qualcomm: x1e80100: T14s: add USB DisplayPort playback Add two DisplayPort (over USB) and one HDMI playback devices, conflicting with the headset, because they use the same MultiMedia1 frontend. Signed-off-by: Krzysztof Kozlowski Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/627 Signed-off-by: Jaroslav Kysela --- ucm2/Qualcomm/x1e80100/T14s-HiFi.conf | 93 +++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf b/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf index 4c0cb1d..715f63b 100644 --- a/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf +++ b/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf @@ -3,6 +3,9 @@ SectionVerb { EnableSequence [ + cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia1' 0" cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1" cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1" cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1" @@ -36,6 +39,12 @@ SectionDevice."Speaker" { SectionDevice."Headphones" { Comment "Headphones playback" + ConflictingDevice [ + "HDMI0" + "HDMI1" + "HDMI2" + ] + Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.conf" Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf" Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf" @@ -43,6 +52,9 @@ SectionDevice."Headphones" { EnableSequence [ cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1" + cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia1' 0" ] DisableSequence [ @@ -87,3 +99,84 @@ SectionDevice."Mic" { CapturePCM "hw:${CardId},3" } } + +SectionDevice."HDMI0" { + Comment "USB/DisplayPort 0 playback" + + ConflictingDevice [ + "Headphones" + "HDMI1" + "HDMI2" + ] + + EnableSequence [ + cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 1" + cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia1' 0" + ] + + DisableSequence [ + cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},0" + JackControl "DP0 Jack" + } +} + +SectionDevice."HDMI1" { + Comment "USB/DisplayPort 1 playback" + + ConflictingDevice [ + "Headphones" + "HDMI0" + "HDMI2" + ] + + EnableSequence [ + cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 1" + cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia1' 0" + ] + + DisableSequence [ + cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},0" + JackControl "DP1 Jack" + } +} + +SectionDevice."HDMI2" { + Comment "HDMI playback" + + ConflictingDevice [ + "Headphones" + "HDMI0" + "HDMI1" + ] + + EnableSequence [ + cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0" + cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia1' 1" + ] + + DisableSequence [ + cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia1' 0" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},0" + JackControl "DP2 Jack" + } +} -- 2.47.3