diff options
| author | Mark Brown <broonie@kernel.org> | 2023-01-28 10:46:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-01-28 10:46:16 +0000 |
| commit | 3d0690140f37dbdad956c5bb18eb2854161ec44f (patch) | |
| tree | 6f41a75c0c888581868d877f65e480c783c9864d /include/sound | |
| parent | 6c9802b82f368cfe1dbd0611d0f9ac0b7cfd1ca0 (diff) | |
| parent | 251a2b11851531526260db1dbc5673a7d6177895 (diff) | |
| download | linux-3d0690140f37dbdad956c5bb18eb2854161ec44f.tar.gz | |
ASoC: SOF: ipc4: Multi-stream playback and capture support
Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:
The following series will enable multi-stream support for playback and capture
streams.
Currently only a single PCM can be connected to a DAI, with the multi-stream
support it is possible to connect multiple PCMs to a single DAI.
To achieve this we need to make sure that DAIs/AIF are only set up once since
other stream could be connected to it later.
We also need to introduce reference or use counting for widgets to make sure
that they are not going to be destroyed while other streams are still using
them.
With the multi-stream support we also need to extend our current locking scheme
which worked well for simple paths.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dpcm.h | 2 | ||||
| -rw-r--r-- | include/sound/sof/ipc4/header.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 2864aed72998..1e7d09556fe3 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -162,6 +162,8 @@ 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); +int widget_in_list(struct snd_soc_dapm_widget_list *list, + struct snd_soc_dapm_widget *widget); #define dpcm_be_dai_startup_rollback(fe, stream, last) \ dpcm_be_dai_stop(fe, stream, 0, last) diff --git a/include/sound/sof/ipc4/header.h b/include/sound/sof/ipc4/header.h index 622193be7ac4..d31349bf011d 100644 --- a/include/sound/sof/ipc4/header.h +++ b/include/sound/sof/ipc4/header.h @@ -185,6 +185,9 @@ enum sof_ipc4_pipeline_state { #define SOF_IPC4_GLB_PIPE_STATE_MASK GENMASK(15, 0) #define SOF_IPC4_GLB_PIPE_STATE(x) ((x) << SOF_IPC4_GLB_PIPE_STATE_SHIFT) +/* pipeline set state IPC msg extension */ +#define SOF_IPC4_GLB_PIPE_STATE_EXT_MULTI BIT(0) + /* load library ipc msg */ #define SOF_IPC4_GLB_LOAD_LIBRARY_LIB_ID_SHIFT 16 #define SOF_IPC4_GLB_LOAD_LIBRARY_LIB_ID(x) ((x) << SOF_IPC4_GLB_LOAD_LIBRARY_LIB_ID_SHIFT) |