Sync from SUSE:SLFO:Main alsa-ucm-conf revision abc0ce6fa9be95fcb1be013be841e323
This commit is contained in:
parent
a92be221d0
commit
9c9426377a
@ -0,0 +1,37 @@
|
||||
From 11b028a9a01e47fc9b48e4a566803752011902e2 Mon Sep 17 00:00:00 2001
|
||||
From: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
|
||||
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 <seppo.ingalsuo@linux.intel.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
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 fea8159e9c99..c755ba26cbe6 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}"
|
||||
}
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -0,0 +1,62 @@
|
||||
From 6397c663d7086b87ca5cbba323ea3dcd0ecd3200 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
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 <perex@perex.cz>
|
||||
---
|
||||
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 c755ba26cbe6..5fd1843ff101 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}"
|
||||
--
|
||||
2.43.0
|
||||
|
||||
BIN
alsa-ucm-conf-1.2.12.tar.bz2
(Stored with Git LFS)
BIN
alsa-ucm-conf-1.2.12.tar.bz2
(Stored with Git LFS)
Binary file not shown.
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmZm7lQACgkQg4BZbabl
|
||||
nJEltA/+ObioojjXbUKa7k7Kn5ETuqNDo0Z6VBY1KutIUjw4FYPR0pBOjepV9ser
|
||||
y/nKMa4aUhTl/iND/g40b+VHe1E1Eyeix1jpJg8aac8nr4+dMdR06n3oiMbl0yKz
|
||||
6+4dMVvM168kqjpiIBVx+hbUfmgZq5EoSyq6wCVTuap5X0KzJkY5vsGaF+J70PFL
|
||||
EV7RAfgpqn3cgqQsysjV4c7iT6uJ3QpLfsBVm9McFRiXq0AMJ0xtetKgGT0BrfZS
|
||||
0fOqOgIln16KfMmquaMid+GajVdzIxslc/ax5tEP3nSHIsk7Dr3NOk1CIP85nf57
|
||||
K2CpNwj5wb0h+LZN5LwYACcozBXNvSm5gYS7yVJ7T+X95FlEHc9ar/RD5NagKsaz
|
||||
VeX2NbFDiD8jBEjvP+/qiyS/pWM/POcfUE1iN0tTKohyBRJDRBFvcw8uATiwkAue
|
||||
48zHbH8eFX7MqNLZyREgTwz+u0qaHm1NTPnDY8E7LX04+lB97jC6eqqN18qxR4j1
|
||||
9DOmYBSiQK3YH85DJh0vLsp2++qeoKhaBaQkbJASiLSEBJ1tVk3wiOtO9Ebp+miA
|
||||
W3Ap0N1LCCDliuu3KOQKsDtB/L87e0sQN/1f088GRYKGwwQQp5f/7GouAr1G7eci
|
||||
URDJPNhDQtYMGAs3XjWl45AzIq+iMBN3rnPUZOMHWJAWvvPUjx8=
|
||||
=3242
|
||||
-----END PGP SIGNATURE-----
|
||||
BIN
alsa-ucm-conf-1.2.13.tar.bz2
(Stored with Git LFS)
Normal file
BIN
alsa-ucm-conf-1.2.13.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
16
alsa-ucm-conf-1.2.13.tar.bz2.sig
Normal file
16
alsa-ucm-conf-1.2.13.tar.bz2.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmczJNYACgkQg4BZbabl
|
||||
nJE+xA/8DNCG+MnrIO2nP0ToWyCI4QiVJlz1YJYs4sqq6R4IR+cl+XEEEREjHpC2
|
||||
80d5/A0LkTWvMKEDxK6WwKr2Y7UF6XXvHKH+YzBSISsP5OAtVsbA7b4njXSXMNCM
|
||||
xS54g9eL4E7eWttWM7WRCqhqtBv1oZXmTp4VJeR1VKTRFTDaJY/kheu0jkvJziHp
|
||||
yDQJsAupKeVSjm4BWuZJV3z6n8iBVe1kfGNo0ylpXh6WnzwmHuAqzw83504Z0lyt
|
||||
xgvEimC3P4Yg/PPZBve9g8ey9KS2dtn/nk94nfcD+2rcT/a5aTDxIXn7LOyq0HHQ
|
||||
OZ2OfVtpS+eidIZsJmNKEIrSOBtRg5PU/yxpOZX2B7ypawdCFN+l2EQjQXXfWdW0
|
||||
GSltPni7y//2lQ47ymKdc0lVN8rchvcUP0Ydqc513efEFHctFur9Xn4WFnGVAdGc
|
||||
QhUkMND/uFe2IKL1/qJEDfYEB3omECnf/MEn+eMZQ9YC7T+CxlgSY6tZp9V9XJQW
|
||||
A6rvQOevKZHYuAkUQofoCYe8uk9xkVHZuIggUKV/MEE0ElxknFbJPLvK+iRtAPi0
|
||||
RiBmdNQg4i/JW4fL2pGZv8KDreW3TNF9kDvhlpw7KMgRVqtIOydufD0cpaRilwXX
|
||||
t3rEnXpC5VAOwRgaS90M3hZxovKvhNvjJi7bcgm8A1gbjtB/tqE=
|
||||
=lHyI
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 13 15:48:52 UTC 2024 - Takashi Iwai <tiwai@suse.com>
|
||||
|
||||
- Backport upstream fixes for sof-hda-dsp:
|
||||
0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch
|
||||
0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 12 14:15:03 UTC 2024 - Takashi Iwai <tiwai@suse.com>
|
||||
|
||||
- Update to version 1.2.13:
|
||||
* Updates for USB-audio, Mediatek, Qualcomm, ACP, SoundWire,
|
||||
wsa884x, wcd938x, Intel AVS, SOF HDA, etc
|
||||
For details, see:
|
||||
https://www.alsa-project.org/wiki/Changes_v1.2.12_v1.2.13#alsa-ucm-conf
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 13 14:57:35 UTC 2024 - Takashi Iwai <tiwai@suse.com>
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: alsa-ucm-conf
|
||||
Version: 1.2.12
|
||||
Version: 1.2.13
|
||||
Release: 0
|
||||
Summary: ALSA UCM Profiles
|
||||
License: BSD-3-Clause
|
||||
@ -26,6 +26,9 @@ Source: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2
|
||||
Source1: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2.sig
|
||||
# from https://www.alsa-project.org/files/pub/gpg-release-key-v1.txt
|
||||
Source2: alsa-ucm-conf.keyring
|
||||
# upstream fixes
|
||||
Patch1: 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch
|
||||
Patch2: 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch
|
||||
BuildRequires: fdupes
|
||||
BuildArch: noarch
|
||||
Requires: libasound2 >= 1.2.6.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user