diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-03-21 14:07:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-03-21 14:07:27 +0100 |
| commit | 9f2347842b526cbc2655068591fb0166362d2999 (patch) | |
| tree | 1d8e00f652520f1bb1036b1182920e1900a916e8 /sound/soc/sof/amd/vangogh.c | |
| parent | 14d811467f6592aa0e685730e66b5f9123287468 (diff) | |
| parent | 9a8b202f8cb7ebebc71f1f2a353a21c76d3063a8 (diff) | |
| download | linux-9f2347842b526cbc2655068591fb0166362d2999.tar.gz | |
Merge tag 'asoc-fix-v6.9-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.9
A bunch of fixes that came in during the merge window, probably the most
substantial thing is the DPCM locking fix for compressed audio which has
been lurking for a while.
Diffstat (limited to 'sound/soc/sof/amd/vangogh.c')
| -rw-r--r-- | sound/soc/sof/amd/vangogh.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/sof/amd/vangogh.c b/sound/soc/sof/amd/vangogh.c index de15d21aa6d98..bc6ffdb5471a5 100644 --- a/sound/soc/sof/amd/vangogh.c +++ b/sound/soc/sof/amd/vangogh.c @@ -143,6 +143,7 @@ EXPORT_SYMBOL_NS(sof_vangogh_ops, SND_SOC_SOF_AMD_COMMON); int sof_vangogh_ops_init(struct snd_sof_dev *sdev) { const struct dmi_system_id *dmi_id; + struct acp_quirk_entry *quirks; /* common defaults */ memcpy(&sof_vangogh_ops, &sof_acp_common_ops, sizeof(struct snd_sof_dsp_ops)); @@ -151,8 +152,12 @@ int sof_vangogh_ops_init(struct snd_sof_dev *sdev) sof_vangogh_ops.num_drv = ARRAY_SIZE(vangogh_sof_dai); dmi_id = dmi_first_match(acp_sof_quirk_table); - if (dmi_id && dmi_id->driver_data) - sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware; + if (dmi_id) { + quirks = dmi_id->driver_data; + + if (quirks->signed_fw_image) + sof_vangogh_ops.load_firmware = acp_sof_load_signed_firmware; + } return 0; } |