ucm2: Qualcomm: x1e80100: add USB DisplayPort playback

Add two DisplayPort (over USB) playback devices, conflicting with the
headset, because they use the same Multimedia1 frontend.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/423
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Qualcomm/x1e80100/HiFi.conf b/ucm2/Qualcomm/x1e80100/HiFi.conf
index 9dee654d9b44e14242bd0a1c280549713550599f..034403c6aca400a1967cfb9d7163f041fe57af5d 100644 (file)
--- a/ucm2/Qualcomm/x1e80100/HiFi.conf
+++ b/ucm2/Qualcomm/x1e80100/HiFi.conf
@@ -3,7 +3,9 @@
 
 SectionVerb {
        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='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
                cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
                cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1"
                cset "name='MultiMedia4 Mixer VA_CODEC_DMA_TX_0' 1"
@@ -39,11 +41,24 @@ SectionDevice."Speaker" {
 SectionDevice."Headphones" {
        Comment "Headphones playback"
 
+       ConflictingDevice [
+               "HDMI0"
+               "HDMI1"
+       ]
+
        Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.conf"
        Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf"
        Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
        Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
 
+       EnableSequence [
+               cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
+       ]
+
+       DisableSequence [
+               cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
+       ]
+
        Value {
                PlaybackPriority 200
                PlaybackPCM "hw:${CardId},0"
@@ -67,3 +82,49 @@ SectionDevice."Mic" {
                CapturePCM "hw:${CardId},3"
        }
 }
+
+SectionDevice."HDMI0" {
+       Comment "USB/DisplayPort 0 playback"
+
+       ConflictingDevice [
+               "Headphones"
+               "HDMI1"
+       ]
+
+       EnableSequence [
+               cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 1"
+       ]
+
+       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"
+       ]
+
+       EnableSequence [
+               cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 1"
+       ]
+
+       DisableSequence [
+               cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0"
+       ]
+
+       Value {
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId},0"
+               JackControl "DP1 Jack"
+       }
+}