Skip to content

Commit

Permalink
sof-hda-dsp: Fix the case where sysfs dmi product_name attribute is n…
Browse files Browse the repository at this point in the history
…ot 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>
  • Loading branch information
perexg committed Nov 13, 2024
1 parent 11b028a commit 6397c66
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down Expand Up @@ -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}"
Expand Down

0 comments on commit 6397c66

Please sign in to comment.