diff -Nru alsa-ucm-conf-1.2.2/debian/changelog alsa-ucm-conf-1.2.2/debian/changelog --- alsa-ucm-conf-1.2.2/debian/changelog 2020-02-29 23:36:53.000000000 +0800 +++ alsa-ucm-conf-1.2.2/debian/changelog 2020-05-25 14:36:48.000000000 +0800 @@ -1,3 +1,9 @@ +alsa-ucm-conf (1.2.2-1ubuntu1) focal; urgency=medium + + * Fix the audio crash on the machine without Intel HDMI audio (lp: #1874698) + + -- Hui Wang Mon, 25 May 2020 14:36:48 +0800 + alsa-ucm-conf (1.2.2-1) unstable; urgency=medium * New upstream release. diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch --- alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.2/debian/patches/0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch 2020-05-25 14:36:37.000000000 +0800 @@ -0,0 +1,140 @@ +From 4722f5b3859903521ba0f92a64d86af31083ca50 Mon Sep 17 00:00:00 2001 +From: Kai Vehmanen +Date: Thu, 5 Mar 2020 14:59:56 +0200 +Subject: [PATCH] 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 +Signed-off-by: Jaroslav Kysela +--- + 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 be6cb39..6f2c4aa 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.25.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch --- alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.2/debian/patches/0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch 2020-05-25 14:36:37.000000000 +0800 @@ -0,0 +1,58 @@ +From 907c8309b2ee671e1b36630b0d29db1bc3124990 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 6 Apr 2020 17:37:20 +0200 +Subject: [PATCH] sof-hda-dsp: change Headphones2 to Mic2 + +Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/19 + +Signed-off-by: Jaroslav Kysela +--- + ucm2/sof-hda-dsp/HiFi.conf | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf +index 60a8693..9a82930 100644 +--- a/ucm2/sof-hda-dsp/HiFi.conf ++++ b/ucm2/sof-hda-dsp/HiFi.conf +@@ -6,7 +6,7 @@ SectionVerb { + ] + } + +-SectionDevice."Headphones1" { ++SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ +@@ -85,9 +85,9 @@ If.monomic { + Control "name='Input Source'" + ControlEnum "Headphone Mic" + } +- After.SectionDevice "Mic" ++ After.SectionDevice "Mic1" + True { +- SectionDevice."Headphones2" { ++ SectionDevice."Mic2" { + Comment "Headphones Stereo Microphone" + + ConflictingDevice [ +@@ -120,7 +120,7 @@ If.monomic { + } + } + False { +- SectionDevice."Headphones2" { ++ SectionDevice."Mic2" { + Comment "Headphones Stereo Microphone" + + Value { +@@ -132,7 +132,7 @@ If.monomic { + } + } + +-SectionDevice."Mic" { ++SectionDevice."Mic1" { + Comment "Digital Microphone" + + Value { +-- +2.25.1 + diff -Nru alsa-ucm-conf-1.2.2/debian/patches/series alsa-ucm-conf-1.2.2/debian/patches/series --- alsa-ucm-conf-1.2.2/debian/patches/series 1970-01-01 08:00:00.000000000 +0800 +++ alsa-ucm-conf-1.2.2/debian/patches/series 2020-05-25 14:36:37.000000000 +0800 @@ -0,0 +1,3 @@ +0001-sof-hda-dsp-Support-systems-without-integrated-graph.patch +0002-sof-hda-dsp-change-Headphones2-to-Mic2.patch +