From c7c29a16fcd6e82162ceebb9f228564e41970dd8 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 16 Nov 2024 17:17:08 +0100 Subject: [PATCH] apply upstream patches to fix HDMI audio detection seen on some platforms [release 1.2.13-2mamba;Sat Nov 16 2024] --- ...eam-fix_handling_of_empty_sys_vendor.patch | 34 +++++++++++ ..._when_sysfs_dmi_product_name_not_set.patch | 59 +++++++++++++++++++ alsa-ucm-conf.spec | 9 ++- 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch create mode 100644 alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch diff --git a/alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch b/alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch new file mode 100644 index 0000000..24664a4 --- /dev/null +++ b/alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch @@ -0,0 +1,34 @@ +From 11b028a9a01e47fc9b48e4a566803752011902e2 Mon Sep 17 00:00:00 2001 +From: Seppo Ingalsuo +Date: Wed, 13 Nov 2024 14:48:38 +0200 +Subject: [PATCH] UCM2: Intel: sof-hda-dsp: Fix handling of empty sys_vendor + +The mistake in UCM syntax caused in alsaucm start error: + +ALSA lib ucm_cond.c:367:(if_eval) unknown If.Condition.Type + +Fixes: 13022a97711d ("sof-hda-dsp: Fix the case where sysfs dmi + sys_vendor attribute is not set") + +Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/463 +Signed-off-by: Seppo Ingalsuo +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/HiFi-sof.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf +index fea8159e..c755ba26 100644 +--- a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf ++++ b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf +@@ -6,8 +6,8 @@ Define.SOFVendor "$${sys:devices/virtual/dmi/id/sys_vendor}" + + If.SOFVendor { + Condition { +- Type Empty +- String "${var:SOFVendor}" ++ Type String ++ Empty "${var:SOFVendor}" + } + True.Define.SOFVendor "${sys:devices/virtual/dmi/id/board_vendor}" + } diff --git a/alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch b/alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch new file mode 100644 index 0000000..4fdbbb4 --- /dev/null +++ b/alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch @@ -0,0 +1,59 @@ +From 6397c663d7086b87ca5cbba323ea3dcd0ecd3200 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 13 Nov 2024 16:19:15 +0100 +Subject: [PATCH] sof-hda-dsp: Fix the case where sysfs dmi product_name + attribute is not set + + !!DMI Information + !!--------------- + + Manufacturer: + Product Name: + Product Version: + Firmware Version: R6G07 + System SKU: Default string + Board Vendor: Default string + Board Name: Default string + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2292583 +Signed-off-by: Jaroslav Kysela +--- + ucm2/Intel/sof-hda-dsp/HiFi-sof.conf | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf +index c755ba26..5fd1843f 100644 +--- a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf ++++ b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf +@@ -3,6 +3,7 @@ + # File paths for controlling SOF processing + + Define.SOFVendor "$${sys:devices/virtual/dmi/id/sys_vendor}" ++Define.SOFProduct "$${sys:devices/virtual/dmi/id/product_name}" + + If.SOFVendor { + Condition { +@@ -12,6 +13,14 @@ If.SOFVendor { + True.Define.SOFVendor "${sys:devices/virtual/dmi/id/board_vendor}" + } + ++If.SOFProduct { ++ Condition { ++ Type String ++ Empty "${var:SOFProduct}" ++ } ++ True.Define.SOFProduct "${sys:devices/virtual/dmi/id/board_name}" ++} ++ + If.SOFIPCVer { + Condition { + Type ControlExists +@@ -43,7 +52,7 @@ If.SOFPath { + HeadphoneIirBlob "${var:BlobPath}/eq_iir/pass.blob" + HeadphoneFirBlob "${var:BlobPath}/eq_fir/pass.blob" + HeadphoneDrcBlob "${var:BlobPath}/drc/passthrough.blob" +- ConfPathFromDMI "${var:SOFVendor}/${sys:devices/virtual/dmi/id/product_name}.conf" ++ ConfPathFromDMI "${var:SOFVendor}/${var:SOFProduct}" + SOFProductConfig "/blobs/sof/product_configs/${var:ConfPathFromDMI}" + SOFConfFullPath "${ConfTopDir}${var:SOFProductConfig}" + SOFUserConfig "/blobs/sof/user_configs/${var:ConfPathFromDMI}" diff --git a/alsa-ucm-conf.spec b/alsa-ucm-conf.spec index 3a8c6f6..f8a4231 100644 --- a/alsa-ucm-conf.spec +++ b/alsa-ucm-conf.spec @@ -1,6 +1,6 @@ Name: alsa-ucm-conf Version: 1.2.13 -Release: 1mamba +Release: 2mamba Summary: ALSA Use Case Manager configuration Group: System/Kernel and Hardware Vendor: openmamba @@ -8,6 +8,8 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/alsa-project/alsa-ucm-conf Source: https://github.com/alsa-project/alsa-ucm-conf.git/v%{version}/alsa-ucm-conf-%{version}.tar.bz2 +Patch0: alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch +Patch1: alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch License: BSD ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -17,6 +19,8 @@ ALSA Use Case Manager configuration. %prep %setup -q +%patch 0 -p1 -b .upstream-fix_handling_of_empty_sys_vendor +%patch 1 -p1 -b .upstream-fix_when_sysfs_dmi_product_name_not_set %build @@ -38,6 +42,9 @@ cp -a ucm2 %{buildroot}%{_datadir}/alsa %doc LICENSE %changelog +* Sat Nov 16 2024 Silvan Calarco 1.2.13-2mamba +- apply upstream patches to fix HDMI audio detection seen on some platforms + * Wed Nov 13 2024 Automatic Build System 1.2.13-1mamba - automatic version update by autodist