From 7e08d4e6b0c75bfee72abbc0b3ac7c7b6e6abec1 Mon Sep 17 00:00:00 2001 From: Jens Glathe Date: Wed, 3 Jun 2026 10:07:24 +0200 Subject: [PATCH] Revert "ucm2: Qualcomm: x1e80100: T14s-HiFi: switch DP outputs to dedicated MultiMedia5/6/7 streams" This reverts commit d4989eb50890509dd65c1528fcdbfb7fefc8487b. Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/772 Signed-off-by: Jens Glathe Signed-off-by: Jaroslav Kysela --- ucm2/Qualcomm/x1e80100/T14s-HiFi.conf | 48 ++++++++++++--------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf b/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf index 5604dff..b7be44a 100644 --- a/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf +++ b/ucm2/Qualcomm/x1e80100/T14s-HiFi.conf @@ -3,13 +3,13 @@ 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" cset "name='MultiMedia4 Mixer VA_CODEC_DMA_TX_0' 1" - cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 1" - cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 1" - cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 1" ] Include.wsae.File "/codecs/wsa884x/two-speakers/DefaultEnableSeq.conf" @@ -52,9 +52,9 @@ SectionDevice."Headphones" { EnableSequence [ cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1" - cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 0" - cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 0" - cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 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' 0" ] DisableSequence [ @@ -111,20 +111,18 @@ SectionDevice."HDMI0" { EnableSequence [ cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0" - cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 1" - cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 0" - cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 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 MultiMedia5' 0" + cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0" ] Value { PlaybackPriority 200 - PlaybackPCM "hw:${CardId},4" - JackControl "DP0 Jack" - PlaybackChannels 2 + PlaybackPCM "hw:${CardId},0" JackControl "DP0 Jack" } } @@ -140,20 +138,18 @@ SectionDevice."HDMI1" { EnableSequence [ cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0" - cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 0" - cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 1" - cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 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 MultiMedia6' 0" + cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0" ] Value { PlaybackPriority 200 - PlaybackPCM "hw:${CardId},5" - JackControl "DP1 Jack" - PlaybackChannels 2 + PlaybackPCM "hw:${CardId},0" JackControl "DP1 Jack" } } @@ -169,20 +165,18 @@ SectionDevice."HDMI2" { EnableSequence [ cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0" - cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia5' 0" - cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia6' 0" - cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 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' 1" ] DisableSequence [ - cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia7' 0" + cset "name='DISPLAY_PORT_RX_2 Audio Mixer MultiMedia1' 0" ] Value { PlaybackPriority 200 - PlaybackPCM "hw:${CardId},6" - JackControl "DP2 Jack" - PlaybackChannels 2 + PlaybackPCM "hw:${CardId},0" JackControl "DP2 Jack" } } -- 2.52.0