diff --git a/0002-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch b/0002-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch new file mode 100644 index 0000000..62077ea --- /dev/null +++ b/0002-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch @@ -0,0 +1,47 @@ +From 369f8b497e15a993d411df81a39ee5c8c1433363 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 7 Jan 2022 10:57:48 +0100 +Subject: [PATCH] HDA-acp: avoid to create 'Mic ACP LED' control for the HDMI + card + +BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1849#note_1210933 +Signed-off-by: Jaroslav Kysela +--- + ucm2/HDA/HDA.conf | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf +index 003d94199ee2..ab80fa51f8be 100644 +--- a/ucm2/HDA/HDA.conf ++++ b/ucm2/HDA/HDA.conf +@@ -43,13 +43,21 @@ If.use { + Comment "Play HiFi quality Music" + } + +- Include.init.File "/HDA/init.conf" ++ If.analog { ++ Condition { ++ Type ControlExists ++ Control "name='Master Playback Switch'" ++ } ++ True { ++ Include.init.File "/HDA/init.conf" + +- FixedBootSequence [ +- cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off" +- exec "-/sbin/modprobe snd_ctl_led" +- sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch" +- ] ++ FixedBootSequence [ ++ cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off" ++ exec "-/sbin/modprobe snd_ctl_led" ++ sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch" ++ ] ++ } ++ } + } + } + +-- +2.31.1 + diff --git a/alsa-ucm-conf.changes b/alsa-ucm-conf.changes index 0434e95..3918b6d 100644 --- a/alsa-ucm-conf.changes +++ b/alsa-ucm-conf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 21 09:42:54 CET 2022 - tiwai@suse.de + +- Fix regression for AMD ACP LED control: + 0002-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch + ------------------------------------------------------------------- Thu Dec 30 09:17:42 CET 2021 - tiwai@suse.de diff --git a/alsa-ucm-conf.spec b/alsa-ucm-conf.spec index 2327d67..3740d1b 100644 --- a/alsa-ucm-conf.spec +++ b/alsa-ucm-conf.spec @@ -1,7 +1,7 @@ # # spec file for package alsa-ucm-conf # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ URL: https://www.alsa-project.org Source: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2 Source1: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2.sig Patch1: 0001-HDA-DualCodecs-fix-typo-in-Speaker-condition.patch +Patch2: 0002-HDA-acp-avoid-to-create-Mic-ACP-LED-control-for-the-.patch BuildRequires: fdupes BuildArch: noarch Requires: libasound2 >= 1.2.6.1