Unverified Commit 01429183 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: sof-audio: setup sched widgets during pipeline complete step 



Older firmware prior to ABI 3.19 has a dependency where the scheduler
widgets need to be setup last. Moving the call to sof_widget_setup()
before the pipeline_complete() call also helps remove the need for the
'reverse' direction when walking through the widget list - this was
only working because of the topology macros but the topology does not
require any order.

Fixes: 5fcdbb2d ("ASoC: SOF: Add support for dynamic pipelines")
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211123171606.129350-1-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 65c16dd2

sound/soc/sof/sof-audio.c

+17 −2
Original line number Diff line number Diff line
@@ -637,16 +637,25 @@ const struct sof_ipc_pipe_new *snd_sof_pipeline_find(struct snd_sof_dev *sdev, 


int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify)

{

	struct sof_ipc_fw_version *v = &sdev->fw_ready.version;

	struct snd_sof_widget *swidget;

	struct snd_sof_route *sroute;

	int ret;



	/* restore pipeline components */

	list_for_each_entry_reverse(swidget, &sdev->widget_list, list) {

	list_for_each_entry(swidget, &sdev->widget_list, list) {

		/* only set up the widgets belonging to static pipelines */

		if (!verify && swidget->dynamic_pipeline_widget)

			continue;



		/*

		 * For older firmware, skip scheduler widgets in this loop,

		 * sof_widget_setup() will be called in the 'complete pipeline' loop

		 */

		if (v->abi_version < SOF_ABI_VER(3, 19, 0) &&

		    swidget->id == snd_soc_dapm_scheduler)

			continue;



		/* update DAI config. The IPC will be sent in sof_widget_setup() */

		if (WIDGET_IS_DAI(swidget->id)) {

			struct snd_sof_dai *dai = swidget->private;
@@ -694,6 +703,12 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify) 
			if (!verify && swidget->dynamic_pipeline_widget)

				continue;



			if (v->abi_version < SOF_ABI_VER(3, 19, 0)) {

				ret = sof_widget_setup(sdev, swidget);

				if (ret < 0)

					return ret;

			}



			swidget->complete =

				snd_sof_complete_pipeline(sdev, swidget);

			break;
@@ -722,7 +737,7 @@ int sof_tear_down_pipelines(struct snd_sof_dev *sdev, bool verify) 
	 * sroute->setup because during suspend all streams are suspended and during topology

	 * loading the sound card unavailable to open PCMs.

	 */

	list_for_each_entry_reverse(swidget, &sdev->widget_list, list) {

	list_for_each_entry(swidget, &sdev->widget_list, list) {

		if (swidget->dynamic_pipeline_widget)

			continue;