Unverified Commit 99c15927 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

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



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: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20251009094023.3474895-8-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6937ff42
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ static int sof_test_topology_file(struct device *dev,
	if (!profile->tplg_path || !profile->tplg_name)
		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,
				  profile->tplg_name);
	if (!tplg_filename)
+5 −0
Original line number Diff line number Diff line
@@ -2523,6 +2523,11 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
	 * callback or the callback returns 0.
	 */
	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_cnt = 1;
		dev_info(scomp->dev, "loading topology: %s\n", file);