Hello community, here is the log from the commit of package alsa-ucm-conf for openSUSE:Factory checked in at 2020-03-16 10:16:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-ucm-conf (Old) and /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-ucm-conf" Mon Mar 16 10:16:27 2020 rev:4 rq:784670 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-ucm-conf/alsa-ucm-conf.changes 2020-02-21 16:41:09.725889675 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.3160/alsa-ucm-conf.changes 2020-03-16 10:17:11.027559020 +0100 @@ -1,0 +2,47 @@ +Fri Mar 13 14:42:51 CET 2020 - [email protected] + +- Update to alsa-ucm-conf 1.2.2: + including previous fixes +- Backport recent upstream fixes: SOF, BDW-rt5677 and jack fixes; + 0001-sof-bdw-rt5677-initial-port-to-UCM2.patch + 0002-ucm2-treewide-JackHWMute-fixes.patch + 0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch +- Drop obsoleted patches: + 0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch + 0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch + 0003-README-remove-topologies-note.patch + 0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch + 0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch + 0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch + 0007-broxton-rt298-corrections-cleanups.patch + 0008-bytcr-rt5640-cleanups-and-corrections.patch + 0009-bytcr-rt5651-cleanups-and-corrections.patch + 0010-bytcht-cx2072x-cleanups-and-corrections.patch + 0011-bytcht-es8316-cleanups-and-corrections.patch + 0012-DAISY-I2S-added-back-PCM-devices.patch + 0013-DB410c-cleanups-and-corrections.patch + 0014-DB820c-cleanups-and-corrections.patch + 0015-Dell-WD15-Dock-cleaups-and-corrections.patch + 0016-HDA-Intel-HiFi-dual-fixes-and-corrections.patch + 0017-cht-bsw-rt5672-fixes-and-corrections.patch + 0018-chtnau8824-fixes-and-corrections.patch + 0019-skylake-rt286-fixes-and-corrections.patch + 0020-SDP4430-corrections-and-fixes.patch + 0021-sof-hda-dsp-fix-typo-PlaybackMixerMaster-PlaybackMas.patch + 0022-broadwell-rt286-add-correct-prefix-to-Priority-field.patch + 0023-GoogleNyan-comment-CaptureControl-what-is-this.patch + 0024-VEYRON-I2S-corrections-and-fixes.patch + 0025-SDP4430-corrections-and-fixes.patch + 0026-chtrt5645-corrections-and-fixes.patch + 0027-GoogleNyan-corrections-and-fixes.patch + 0028-PAZ00-corrections-and-fixes.patch + 0029-SDP4430-corrections-and-fixes.patch + 0030-PandaBoard-corrections-and-fixes.patch + 0031-PandaBoardES-corrections-and-fixes.patch + 0032-kblrt5660-corrections-and-fixes.patch + 0033-bytcr-rt5640-corrections-and-fixes.patch + 0034-bytcht-es8316-corrections-and-fixes.patch + 0035-sof-hda-dsp-corrections-and-fixes.patch + 0036-ucm2-treewide-remove-Playback-and-Capture-channels-2.patch + +------------------------------------------------------------------- Old: ---- 0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch 0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch 0003-README-remove-topologies-note.patch 0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch 0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch 0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch 0007-broxton-rt298-corrections-cleanups.patch 0008-bytcr-rt5640-cleanups-and-corrections.patch 0009-bytcr-rt5651-cleanups-and-corrections.patch 0010-bytcht-cx2072x-cleanups-and-corrections.patch 0011-bytcht-es8316-cleanups-and-corrections.patch 0012-DAISY-I2S-added-back-PCM-devices.patch 0013-DB410c-cleanups-and-corrections.patch 0014-DB820c-cleanups-and-corrections.patch 0015-Dell-WD15-Dock-cleaups-and-corrections.patch 0016-HDA-Intel-HiFi-dual-fixes-and-corrections.patch 0017-cht-bsw-rt5672-fixes-and-corrections.patch 0018-chtnau8824-fixes-and-corrections.patch 0019-skylake-rt286-fixes-and-corrections.patch 0020-SDP4430-corrections-and-fixes.patch 0021-sof-hda-dsp-fix-typo-PlaybackMixerMaster-PlaybackMas.patch 0022-broadwell-rt286-add-correct-prefix-to-Priority-field.patch 0023-GoogleNyan-comment-CaptureControl-what-is-this.patch 0024-VEYRON-I2S-corrections-and-fixes.patch 0025-SDP4430-corrections-and-fixes.patch 0026-chtrt5645-corrections-and-fixes.patch 0027-GoogleNyan-corrections-and-fixes.patch 0028-PAZ00-corrections-and-fixes.patch 0029-SDP4430-corrections-and-fixes.patch 0030-PandaBoard-corrections-and-fixes.patch 0031-PandaBoardES-corrections-and-fixes.patch 0032-kblrt5660-corrections-and-fixes.patch 0033-bytcr-rt5640-corrections-and-fixes.patch 0034-bytcht-es8316-corrections-and-fixes.patch 0035-sof-hda-dsp-corrections-and-fixes.patch 0036-ucm2-treewide-remove-Playback-and-Capture-channels-2.patch alsa-ucm-conf-1.2.1.2.tar.bz2 New: ---- 0001-sof-bdw-rt5677-initial-port-to-UCM2.patch 0002-ucm2-treewide-JackHWMute-fixes.patch 0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch alsa-ucm-conf-1.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-ucm-conf.spec ++++++ --- /var/tmp/diff_new_pack.Z41WVq/_old 2020-03-16 10:17:14.147560291 +0100 +++ /var/tmp/diff_new_pack.Z41WVq/_new 2020-03-16 10:17:14.147560291 +0100 @@ -17,48 +17,15 @@ Name: alsa-ucm-conf -Version: 1.2.1.2 +Version: 1.2.2 Release: 0 Summary: ALSA UCM Profiles License: BSD-3-Clause Url: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version}.tar.bz2 -Patch1: 0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch -Patch2: 0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch -Patch3: 0003-README-remove-topologies-note.patch -Patch4: 0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch -Patch5: 0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch -Patch6: 0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch -Patch7: 0007-broxton-rt298-corrections-cleanups.patch -Patch8: 0008-bytcr-rt5640-cleanups-and-corrections.patch -Patch9: 0009-bytcr-rt5651-cleanups-and-corrections.patch -Patch10: 0010-bytcht-cx2072x-cleanups-and-corrections.patch -Patch11: 0011-bytcht-es8316-cleanups-and-corrections.patch -Patch12: 0012-DAISY-I2S-added-back-PCM-devices.patch -Patch13: 0013-DB410c-cleanups-and-corrections.patch -Patch14: 0014-DB820c-cleanups-and-corrections.patch -Patch15: 0015-Dell-WD15-Dock-cleaups-and-corrections.patch -Patch16: 0016-HDA-Intel-HiFi-dual-fixes-and-corrections.patch -Patch17: 0017-cht-bsw-rt5672-fixes-and-corrections.patch -Patch18: 0018-chtnau8824-fixes-and-corrections.patch -Patch19: 0019-skylake-rt286-fixes-and-corrections.patch -Patch20: 0020-SDP4430-corrections-and-fixes.patch -Patch21: 0021-sof-hda-dsp-fix-typo-PlaybackMixerMaster-PlaybackMas.patch -Patch22: 0022-broadwell-rt286-add-correct-prefix-to-Priority-field.patch -Patch23: 0023-GoogleNyan-comment-CaptureControl-what-is-this.patch -Patch24: 0024-VEYRON-I2S-corrections-and-fixes.patch -Patch25: 0025-SDP4430-corrections-and-fixes.patch -Patch26: 0026-chtrt5645-corrections-and-fixes.patch -Patch27: 0027-GoogleNyan-corrections-and-fixes.patch -Patch28: 0028-PAZ00-corrections-and-fixes.patch -Patch29: 0029-SDP4430-corrections-and-fixes.patch -Patch30: 0030-PandaBoard-corrections-and-fixes.patch -Patch31: 0031-PandaBoardES-corrections-and-fixes.patch -Patch32: 0032-kblrt5660-corrections-and-fixes.patch -Patch33: 0033-bytcr-rt5640-corrections-and-fixes.patch -Patch34: 0034-bytcht-es8316-corrections-and-fixes.patch -Patch35: 0035-sof-hda-dsp-corrections-and-fixes.patch -Patch36: 0036-ucm2-treewide-remove-Playback-and-Capture-channels-2.patch +Patch1: 0001-sof-bdw-rt5677-initial-port-to-UCM2.patch +Patch2: 0002-ucm2-treewide-JackHWMute-fixes.patch +Patch3: 0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,43 +33,10 @@ This package contains the profiles files for ALSA UCM (Use Case Manager). %prep -%setup -q -c -a0 +%setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 %build ++++++ 0001-sof-bdw-rt5677-initial-port-to-UCM2.patch ++++++ >From 46222753fdddc86d6a0b92c465875f71c628a779 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <[email protected]> Date: Thu, 27 Feb 2020 12:40:20 -0600 Subject: [PATCH 1/3] sof-bdw-rt5677: initial port to UCM2 Tested on Pixel 2015/SAMUS Chromebook. Known limitations: Left/Right confusion (probably a firmware issue) PulseAudio does not switch capture devices on headset plug Signed-off-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- ucm2/sof-bdw-rt5677/HiFi.conf | 194 ++++++++++++++++++++++++++++++++ ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf | 6 + 2 files changed, 200 insertions(+) create mode 100644 ucm2/sof-bdw-rt5677/HiFi.conf create mode 100644 ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf diff --git a/ucm2/sof-bdw-rt5677/HiFi.conf b/ucm2/sof-bdw-rt5677/HiFi.conf new file mode 100644 index 000000000000..f4b144996d37 --- /dev/null +++ b/ucm2/sof-bdw-rt5677/HiFi.conf @@ -0,0 +1,194 @@ +# Use case Configuration for sof-bdw-rt5677 +# command-line sequence to switch playback/capture +# alsaucm -c sof-bdw-rt5677 set _verb HiFi +# alsaucm -c sof-bdw-rt5677 set _verb HiFi set _enadev Headphones + + +SectionVerb { + + EnableSequence [ + + cset "name='PDM1 L Mux' STO1 DAC MIX" + cset "name='PDM1 R Mux' STO1 DAC MIX" + + # Adjust Master Playback volume if needed + # cset "name='Master Playback Volume' 30" + + cset "name='OUT1 Playback Switch' off" + cset "name='OUT2 Playback Switch' off" + + cset "name='DAC1 Playback Volume' 175" + cset "name='DAC2 Playback Volume' 175" + cset "name='DAC12 SRC Mux' STO1 DAC MIX" + + cset "name='Stereo DAC MIXL ST L Switch' off" + cset "name='Stereo DAC MIXL DAC1 L Switch' off" + cset "name='Stereo DAC MIXL DAC2 L Switch' off" + cset "name='Stereo DAC MIXL DAC1 R Switch' on" + + cset "name='Stereo DAC MIXR ST R Switch' off" + cset "name='Stereo DAC MIXR DAC1 R Switch' off" + cset "name='Stereo DAC MIXR DAC2 R Switch' off" + cset "name='Stereo DAC MIXR DAC1 L Switch' on" + + cset "name='DAC1 MIXL Stereo ADC Switch' off" + cset "name='DAC1 MIXL DAC1 Switch' on" + + cset "name='DAC1 MIXR Stereo ADC Switch' off" + cset "name='DAC1 MIXR DAC1 Switch' on" + + cset "name='DAC1 Mux' IF1 DAC 01" + + cset "name='Stereo1 DMIC Mux' DMIC1" + cset "name='Stereo1 ADC2 Mux' DMIC" + cset "name='Stereo1 ADC1 Mux' ADC1/2" + + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + + cset "name='IF1 ADC1 Mux' STO1 ADC MIX" + cset "name='IF1 ADC1 Swap Mux' L/R" + + # Adjust Mic Capture Volume if needed + # cset "name='Mic Capture Volume' 30" + + cset "name='ADC1 Capture Switch' on" + cset "name='ADC1 Capture Volume' 31" + cset "name='STO1 ADC Boost Volume' 2" + + cset "name='Headphone Switch' off" + cset "name='Speaker Switch' on" + + cset "name='Remote DMICs Switch' on" + cset "name='Mono DMIC L Mux' DMIC1" + cset "name='Mono ADC2 L Mux' DMIC" + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXL ADC2 Switch' on" + cset "name='VAD ADC Mux' MONO ADC MIX L" + cset "name='IB01 Mux' VAD ADC/DAC1 FS" + cset "name='IB01 Bypass Mux' Bypass" + cset "name='Mono ADC Boost Volume' 2" + ] + + DisableSequence [ + ] +} + +SectionDevice."Speaker" { + Comment "Speakers" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + } +} + + +SectionDevice."Headphones" { + Comment "Headphones" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cset "name='Speaker Switch' off" + cset "name='Stereo DAC MIXL DAC1 R Switch' off" + cset "name='Stereo DAC MIXR DAC1 L Switch' off" + cset "name='Stereo DAC MIXL DAC1 L Switch' on" + cset "name='Stereo DAC MIXR DAC1 R Switch' on" + cset "name='OUT1 Playback Switch' on" + cset "name='OUT2 Playback Switch' on" + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + cset "name='OUT1 Playback Switch' off" + cset "name='OUT2 Playback Switch' off" + cset "name='Stereo DAC MIXL DAC1 L Switch' off" + cset "name='Stereo DAC MIXR DAC1 R Switch' off" + cset "name='Stereo DAC MIXL DAC1 R Switch' on" + cset "name='Stereo DAC MIXR DAC1 L Switch' on" + cset "name='Speaker Switch' on" + ] + + Value { + PlaybackPriority 300 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + JackHWMute "Speakers" + } +} + +SectionDevice."Mic" { + Comment "Internal Microphone" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + ConflictingDevice [ + "Mic" + ] + + EnableSequence [ + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Local DMICs Switch' off" + + cset "name='IF1 ADC1 Swap Mux' L/L" + + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Headset Mic Switch' on" + ] + + DisableSequence [ + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Headset Mic Switch' off" + + cset "name='IF1 ADC1 Swap Mux' L/R" + + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + cset "name='Local DMICs Switch' on" + ] + + Value { + CapturePriority 300 + CapturePCM "hw:${CardId}" + JackControl "Mic Jack" + } +} diff --git a/ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf b/ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf new file mode 100644 index 000000000000..d672df281af8 --- /dev/null +++ b/ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf @@ -0,0 +1,6 @@ +Syntax 2 + +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Default" +} -- 2.16.4 ++++++ 0002-ucm2-treewide-JackHWMute-fixes.patch ++++++ >From da45a07c756308b57facf1a97c4842274ff04fe3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela <[email protected]> Date: Sun, 1 Mar 2020 16:12:28 +0100 Subject: [PATCH 2/3] ucm2: treewide - JackHWMute fixes Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/14 Signed-off-by: Jaroslav Kysela <[email protected]> --- ucm2/HDA-Intel/HiFi-dual.conf | 1 + ucm2/broxton-rt298/HiFi.conf | 1 - ucm2/chtrt5645/HiFi-dmic2.conf | 2 +- ucm2/skylake-rt286/HiFi.conf | 1 - ucm2/sof-bdw-rt5677/HiFi.conf | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf index 174fef4787b1..277894ada2f7 100644 --- a/ucm2/HDA-Intel/HiFi-dual.conf +++ b/ucm2/HDA-Intel/HiFi-dual.conf @@ -93,6 +93,7 @@ SectionDevice."Mic2" { CapturePriority 300 CapturePCM "hw:${CardId}" JackHWMute "Line2" + JackControl "Mic Jack" } ConflictingDevice [ diff --git a/ucm2/broxton-rt298/HiFi.conf b/ucm2/broxton-rt298/HiFi.conf index 6f5b9a594f65..f7e561f9c4eb 100644 --- a/ucm2/broxton-rt298/HiFi.conf +++ b/ucm2/broxton-rt298/HiFi.conf @@ -30,7 +30,6 @@ SectionDevice."Speaker" { Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" - JackHWMute "Headphones" } } diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf index c9fdd79e4cd0..d3f880aa6bc0 100644 --- a/ucm2/chtrt5645/HiFi-dmic2.conf +++ b/ucm2/chtrt5645/HiFi-dmic2.conf @@ -98,7 +98,7 @@ SectionDevice."Headset" { CapturePriority 200 CapturePCM "hw:${CardId}" JackControl "Headset Mic Jack" - JackHWMute "DMic" + JackHWMute "Mic" } EnableSequence [ diff --git a/ucm2/skylake-rt286/HiFi.conf b/ucm2/skylake-rt286/HiFi.conf index 9e94a1b1072d..ed4bfa73c095 100644 --- a/ucm2/skylake-rt286/HiFi.conf +++ b/ucm2/skylake-rt286/HiFi.conf @@ -51,7 +51,6 @@ SectionDevice."Speaker" { Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" - JackHWMute "Headphones" } } diff --git a/ucm2/sof-bdw-rt5677/HiFi.conf b/ucm2/sof-bdw-rt5677/HiFi.conf index f4b144996d37..724a1cc3fbdf 100644 --- a/ucm2/sof-bdw-rt5677/HiFi.conf +++ b/ucm2/sof-bdw-rt5677/HiFi.conf @@ -132,7 +132,7 @@ SectionDevice."Headphones" { PlaybackPriority 300 PlaybackPCM "hw:${CardId}" JackControl "Headphone Jack" - JackHWMute "Speakers" + JackHWMute "Speaker" } } -- 2.16.4 ++++++ 0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch ++++++ >From 4722f5b3859903521ba0f92a64d86af31083ca50 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen <[email protected]> Date: Thu, 5 Mar 2020 14:59:56 +0200 Subject: [PATCH 3/3] sof-hda-dsp: Support systems without integrated graphics audio On systems where integrated graphics audio is not present or is disabled, the HDMI PCM nodes are disabled. Add rules to detect these systems by checking presence of HDMI jack controls with UCM2 rules. Signed-off-by: Kai Vehmanen <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- ucm2/sof-hda-dsp/Hdmi.conf | 96 +++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 36 deletions(-) diff --git a/ucm2/sof-hda-dsp/Hdmi.conf b/ucm2/sof-hda-dsp/Hdmi.conf index be6cb39945c5..6f2c4aa99db2 100644 --- a/ucm2/sof-hda-dsp/Hdmi.conf +++ b/ucm2/sof-hda-dsp/Hdmi.conf @@ -1,55 +1,79 @@ # Use case Configuration for sof-hda-dsp -SectionDevice."HDMI1" { - Comment "HDMI1/DP1 Output" +If.hdmi1 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=3 Jack'" + } + True { + SectionDevice."HDMI1" { + Comment "HDMI1/DP1 Output" - EnableSequence [ - cset "name='IEC958 Playback Switch' on" - ] + EnableSequence [ + cset "name='IEC958 Playback Switch' on" + ] - DisableSequence [ - cset "name='IEC958 Playback Switch' off" - ] + DisableSequence [ + cset "name='IEC958 Playback Switch' off" + ] - Value { - PlaybackPriority 500 - PlaybackPCM "hw:${CardId},3" - JackControl "HDMI/DP,pcm=3 Jack" + Value { + PlaybackPriority 500 + PlaybackPCM "hw:${CardId},3" + JackControl "HDMI/DP,pcm=3 Jack" + } + } } } -SectionDevice."HDMI2" { - Comment "HDMI2/DP2 Output" +If.hdmi2 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'" + } + True { + SectionDevice."HDMI2" { + Comment "HDMI2/DP2 Output" - EnableSequence [ - cset "name='IEC958 Playback Switch',index=1 on" - ] + EnableSequence [ + cset "name='IEC958 Playback Switch',index=1 on" + ] - DisableSequence [ - cset "name='IEC958 Playback Switch',index=1 off" - ] + DisableSequence [ + cset "name='IEC958 Playback Switch',index=1 off" + ] - Value { - PlaybackPriority 600 - PlaybackPCM "hw:${CardId},4" - JackControl "HDMI/DP,pcm=4 Jack" + Value { + PlaybackPriority 600 + PlaybackPCM "hw:${CardId},4" + JackControl "HDMI/DP,pcm=4 Jack" + } + } } } -SectionDevice."HDMI3" { - Comment "HDMI3/DP3 Output" +If.hdmi3 { + Condition { + Type ControlExists + Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'" + } + True { + SectionDevice."HDMI3" { + Comment "HDMI3/DP3 Output" - EnableSequence [ - cset "name='IEC958 Playback Switch',index=2 on" - ] + EnableSequence [ + cset "name='IEC958 Playback Switch',index=2 on" + ] - DisableSequence [ - cset "name='IEC958 Playback Switch',index=2 off" - ] + DisableSequence [ + cset "name='IEC958 Playback Switch',index=2 off" + ] - Value { - PlaybackPriority 700 - PlaybackPCM "hw:${CardId},5" - JackControl "HDMI/DP,pcm=5 Jack" + Value { + PlaybackPriority 700 + PlaybackPCM "hw:${CardId},5" + JackControl "HDMI/DP,pcm=5 Jack" + } + } } } -- 2.16.4 ++++++ alsa-ucm-conf-1.2.1.2.tar.bz2 -> alsa-ucm-conf-1.2.2.tar.bz2 ++++++ ++++ 12672 lines of diff (skipped)
