github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SOF: don't check the existence of dummy topology

Browse Source 
Monolithic topology is not needed if function topology is used. Instead
of creating a dummy topology in the file system, we can skip the
existence check in the kernel.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20251009094023.3474895-8-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bard Liao 2025-10-09 17:40:21 +08:00 committed by Mark Brown
parent 6937ff42f2
commit 99c159279c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/sof/fw-file-profile.c
View File

@ -73,6 +73,10 @@ static int sof_test_topology_file(struct device *dev,
if (!profile->tplg_path || !profile->tplg_name) if (!profile->tplg_path || !profile->tplg_name)
return 0; return 0;
/* Dummy topology does not exist and should not be used */
if (strstr(profile->tplg_name, "dummy"))
return 0;
tplg_filename = kasprintf(GFP_KERNEL, "%s/%s", profile->tplg_path, tplg_filename = kasprintf(GFP_KERNEL, "%s/%s", profile->tplg_path,
profile->tplg_name); profile->tplg_name);
if (!tplg_filename) if (!tplg_filename)

5
sound/soc/sof/topology.c
View File

@ -2523,6 +2523,11 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
* callback or the callback returns 0. * callback or the callback returns 0.
*/ */
if (!tplg_cnt) { if (!tplg_cnt) {
if (strstr(file, "dummy")) {
dev_err(scomp->dev,
"Function topology is required, please upgrade sof-firmware\n");
return -EINVAL;
}
tplg_files[0] = file; tplg_files[0] = file;
tplg_cnt = 1; tplg_cnt = 1;
dev_info(scomp->dev, "loading topology: %s\n", file); dev_info(scomp->dev, "loading topology: %s\n", file);