aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/sof/ipc4-topology.h
diff options
context:
space:
mode:
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>2023-03-13 14:48:49 +0200
committerMark Brown <broonie@kernel.org>2023-03-13 14:08:23 +0000
commit594c1bb9ff7365b90cb4d325deb8c38ddda90557 (patch)
tree878996ef05bc887ba6a3e91570d8d9699d597dbb /sound/soc/sof/ipc4-topology.h
parentASoC: SOF: ipc4-topology: Add a new field in struct sof_ipc4_available_audio_format (diff)
downloadwireguard-linux-594c1bb9ff7365b90cb4d325deb8c38ddda90557.tar.xz
wireguard-linux-594c1bb9ff7365b90cb4d325deb8c38ddda90557.zip
ASoC: SOF: ipc4-topology: Do not parse the DMA_BUFFER_SIZE token
Do not parse the SOF_TKN_CAVS_AUDIO_FORMAT_DMA_BUFFER_SIZE token as the dma_buffer_size can be derived from the input/output buffer size and the type of widget during copier prepare. For the deep buffer case, introduce a new token that will be used to get the deep buffer DMA size for the host copier from topology. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20230313124856.8140-5-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/ipc4-topology.h')
-rw-r--r--sound/soc/sof/ipc4-topology.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/sof/ipc4-topology.h b/sound/soc/sof/ipc4-topology.h
index addc5b55cc10..696d6c39a21b 100644
--- a/sound/soc/sof/ipc4-topology.h
+++ b/sound/soc/sof/ipc4-topology.h
@@ -55,6 +55,9 @@
#define SOF_IPC4_INVALID_NODE_ID 0xffffffff
+/* FW requires minimum 2ms DMA buffer size */
+#define SOF_IPC4_MIN_DMA_BUFFER_SIZE 2
+
/*
* The base of multi-gateways. Multi-gateways addressing starts from
* ALH_MULTI_GTW_BASE and there are ALH_MULTI_GTW_COUNT multi-sources
@@ -148,7 +151,6 @@ struct ipc4_pipeline_set_state_data {
* @out_audio_fmt: Available output audio format
* @input_audio_fmts: Available input audio formats
* @ref_audio_fmt: Reference audio format to match runtime audio format
- * @dma_buffer_size: Available Gateway DMA buffer size (in bytes)
* @audio_fmt_num: Number of available audio formats
*/
struct sof_ipc4_available_audio_format {
@@ -156,7 +158,6 @@ struct sof_ipc4_available_audio_format {
struct sof_ipc4_audio_format *out_audio_fmt;
struct sof_ipc4_audio_format *input_audio_fmts;
struct sof_ipc4_audio_format *ref_audio_fmt;
- u32 *dma_buffer_size;
int audio_fmt_num;
};