Unverified Commit 27547a39 authored Oct 01, 2021 by Mark Brown

Merge series "Add support for on demand pipeline setup/destroy" from Peter...

Merge series "Add support for on demand pipeline setup/destroy" from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

Hi,

The previous, v2 of this series was sent by Daniel Baluta:
https://lore.kernel.org/alsa-devel/20210917143659.401102-1-daniel.baluta@oss.nxp.com/

We have agreed that it might be better that someone from Intel is going to take it
from here as we already have the infrastructure up to test and verify the
dynamic pipelines support.

Changes since v2 (sent by Daniel Baluta):
- patch 10: Fix NULL point dereference in hda_dai_update_config()
- I have kept Daniel's SoB for the series.

Changes since v1:
- Signed-off-by tag added by Daniel

This series implements initial support for dynamic pipelines to setup/teardown
pipeline as needed when a PCM is open/closed.

Initially dynamic pipelines are only supported with single core setup which will
be expanded with a follow-up series.

Review with SOF community at
https://github.com/thesofproject/linux/pull/2794

The feature has been merged on 1st of April to sof-dev, all issues found since
has been fixed and squashed to this upstream series.

Regards,
Peter
---
Ranjani Sridharan (12):
  ASoC: topology: change the complete op in snd_soc_tplg_ops to return
    int
  ASoC: SOF: control: Add access field in struct snd_sof_control
  ASoC: SOF: topology: Add new token for dynamic pipeline
  ASoC: SOF: sof-audio: add helpers for widgets, kcontrols and dai
    config set up
  AsoC: dapm: export a couple of functions
  ASoC: SOF: Add new fields to snd_sof_route
  ASoC: SOF: restore kcontrols for widget during set up
  ASoC: SOF: Don't set up widgets during topology parsing
  ASoC: SOF: Introduce widget use_count
  ASoC: SOF: Intel: hda: make sure DAI widget is set up before IPC
  ASoC: SOF: Add support for dynamic pipelines
  ASoC: SOF: topology: Add kernel parameter for topology verification

 include/sound/soc-dpcm.h               |   1 +
 include/sound/soc-topology.h           |   2 +-
 include/uapi/sound/sof/tokens.h        |   1 +
 sound/soc/intel/skylake/skl-topology.c |   6 +-
 sound/soc/soc-dapm.c                   |   2 +
 sound/soc/soc-pcm.c                    |   4 +-
 sound/soc/soc-topology.c               |  10 +-
 sound/soc/sof/intel/hda-dai.c          | 174 +++---
 sound/soc/sof/intel/hda.c              | 177 ++++--
 sound/soc/sof/intel/hda.h              |   5 +
 sound/soc/sof/ipc.c                    |  22 +
 sound/soc/sof/pcm.c                    |  58 +-
 sound/soc/sof/pm.c                     |   4 +-
 sound/soc/sof/sof-audio.c              | 709 +++++++++++++++++++------
 sound/soc/sof/sof-audio.h              |  32 +-
 sound/soc/sof/sof-priv.h               |   1 +
 sound/soc/sof/topology.c               | 362 +++++--------
 17 files changed, 1032 insertions(+), 538 deletions(-)

--
2.33.0

parents 83bea088 c0e7969c

include/sound/soc-dpcm.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, int cmd);
		int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream);
		int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir,
		int event);
		bool dpcm_end_walk_at_be(struct snd_soc_dapm_widget *widget, enum snd_soc_dapm_direction dir);

		#define dpcm_be_dai_startup_rollback(fe, stream, last) \
		dpcm_be_dai_stop(fe, stream, 0, last)

include/sound/soc-topology.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ struct snd_soc_tplg_ops {
		struct snd_soc_tplg_hdr *);

		/* completion - called at completion of firmware loading */
		void (complete)(struct snd_soc_component );
		int (complete)(struct snd_soc_component comp);

		/* manifest - optional to inform component of manifest */
		int (manifest)(struct snd_soc_component , int index,

include/uapi/sound/sof/tokens.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@
		#define SOF_TKN_SCHED_CORE 203
		#define SOF_TKN_SCHED_FRAMES 204
		#define SOF_TKN_SCHED_TIME_DOMAIN 205
		#define SOF_TKN_SCHED_DYNAMIC_PIPELINE 206

		/* volume */
		#define SOF_TKN_VOLUME_RAMP_STEP_TYPE 250

sound/soc/intel/skylake/skl-topology.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3637,7 +3637,7 @@ static int skl_manifest_load(struct snd_soc_component *cmpnt, int index,
		return 0;
		}

		static void skl_tplg_complete(struct snd_soc_component *component)
		static int skl_tplg_complete(struct snd_soc_component *component)
		{
		struct snd_soc_dobj *dobj;
		struct snd_soc_acpi_mach *mach;
		@@ -3646,7 +3646,7 @@ static void skl_tplg_complete(struct snd_soc_component *component)

		val = kmalloc(sizeof(*val), GFP_KERNEL);
		if (!val)
		return;
		return -ENOMEM;

		mach = dev_get_platdata(component->card->dev);
		list_for_each_entry(dobj, &component->dobj_list, list) {
		@@ -3671,7 +3671,9 @@ static void skl_tplg_complete(struct snd_soc_component *component)
		}
		}
		}

		kfree(val);
		return 0;
		}

		static struct snd_soc_tplg_ops skl_tplg_ops = {

sound/soc/soc-dapm.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1331,11 +1331,13 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

		return paths;
		}
		EXPORT_SYMBOL_GPL(snd_soc_dapm_dai_get_connected_widgets);

		void snd_soc_dapm_dai_free_widgets(struct snd_soc_dapm_widget_list **list)
		{
		dapm_widget_list_free(list);
		}
		EXPORT_SYMBOL_GPL(snd_soc_dapm_dai_free_widgets);

		/*
		* Handler for regulator supply widget.