From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
To: lgirdwood@gmail.com, broonie@kernel.org
Cc: alsa-devel@alsa-project.org,
pierre-louis.bossart@linux.intel.com,
ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com,
yung-chuan.liao@linux.intel.com, rander.wang@intel.com
Subject: [PATCH 09/11] ASoC: SOF: ipc4-topology: Remove the ref_audio_fmt field
Date: Mon, 13 Mar 2023 14:48:54 +0200 [thread overview]
Message-ID: <20230313124856.8140-10-peter.ujfalusi@linux.intel.com> (raw)
In-Reply-To: <20230313124856.8140-1-peter.ujfalusi@linux.intel.com>
From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Remove the field in struct sof_ipc4_available_audio_format and pass the
format list to be searched as an argument to sof_ipc4_init_audio_fmt()
directly.
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>
---
sound/soc/sof/ipc4-topology.c | 42 +++++++++++++++--------------------
sound/soc/sof/ipc4-topology.h | 2 --
2 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index baa8f4fa6d20..3aacc440a5e4 100644
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -829,16 +829,16 @@ static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,
struct snd_sof_widget *swidget,
struct sof_ipc4_base_module_cfg *base_config,
struct snd_pcm_hw_params *params,
- struct sof_ipc4_available_audio_format *available_fmt)
+ struct sof_ipc4_available_audio_format *available_fmt,
+ struct sof_ipc4_pin_format *pin_fmts)
{
- struct sof_ipc4_pin_format *pin_fmt = available_fmt->ref_audio_fmt;
u32 valid_bits;
u32 channels;
u32 rate;
int sample_valid_bits;
int i;
- if (!pin_fmt) {
+ if (!pin_fmts) {
dev_err(sdev->dev, "no reference formats for %s\n", swidget->widget->name);
return -EINVAL;
}
@@ -868,7 +868,7 @@ static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,
* sample_valid_bytes from runtime params
*/
for (i = 0; i < available_fmt->audio_fmt_num; i++) {
- struct sof_ipc4_audio_format *fmt = &pin_fmt[i].audio_fmt;
+ struct sof_ipc4_audio_format *fmt = &pin_fmts[i].audio_fmt;
rate = fmt->sampling_frequency;
channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg);
@@ -1058,6 +1058,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
struct sof_ipc4_available_audio_format *available_fmt;
struct snd_soc_component *scomp = swidget->scomp;
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
+ struct sof_ipc4_pin_format *format_list_to_search;
struct sof_ipc4_copier_data *copier_data;
struct snd_pcm_hw_params *ref_params;
struct sof_ipc4_copier *ipc4_copier;
@@ -1102,9 +1103,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
* for capture.
*/
if (dir == SNDRV_PCM_STREAM_PLAYBACK)
- available_fmt->ref_audio_fmt = available_fmt->input_pin_fmts;
+ format_list_to_search = available_fmt->input_pin_fmts;
else
- available_fmt->ref_audio_fmt = available_fmt->output_pin_fmts;
+ format_list_to_search = available_fmt->output_pin_fmts;
copier_data->gtw_cfg.node_id &= ~SOF_IPC4_NODE_INDEX_MASK;
copier_data->gtw_cfg.node_id |=
@@ -1124,7 +1125,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
copier_data = &ipc4_copier->data;
available_fmt = &ipc4_copier->available_fmt;
if (dir == SNDRV_PCM_STREAM_CAPTURE) {
- available_fmt->ref_audio_fmt = available_fmt->output_pin_fmts;
+ format_list_to_search = available_fmt->output_pin_fmts;
/*
* modify the input params for the dai copier as it only supports
@@ -1134,7 +1135,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
snd_mask_none(fmt);
snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S32_LE);
} else {
- available_fmt->ref_audio_fmt = available_fmt->input_pin_fmts;
+ format_list_to_search = available_fmt->input_pin_fmts;
}
ref_params = pipeline_params;
@@ -1154,8 +1155,8 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
copier_data = &ipc4_copier->data;
available_fmt = &ipc4_copier->available_fmt;
- /* Use the input formats as the reference to match pcm params */
- available_fmt->ref_audio_fmt = available_fmt->input_pin_fmts;
+ /* Use the input formats to match pcm params */
+ format_list_to_search = available_fmt->input_pin_fmts;
ref_params = pipeline_params;
break;
@@ -1168,7 +1169,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
/* set input and output audio formats */
ret = sof_ipc4_init_audio_fmt(sdev, swidget, &copier_data->base_config, ref_params,
- available_fmt);
+ available_fmt, format_list_to_search);
if (ret < 0)
return ret;
@@ -1353,11 +1354,9 @@ static int sof_ipc4_prepare_gain_module(struct snd_sof_widget *swidget,
struct sof_ipc4_available_audio_format *available_fmt = &gain->available_fmt;
int ret;
- available_fmt->ref_audio_fmt = available_fmt->input_pin_fmts;
-
- /* output format is not required to be sent to the FW for gain */
ret = sof_ipc4_init_audio_fmt(sdev, swidget, &gain->base_config,
- pipeline_params, available_fmt);
+ pipeline_params, available_fmt,
+ available_fmt->input_pin_fmts);
if (ret < 0)
return ret;
@@ -1378,12 +1377,9 @@ static int sof_ipc4_prepare_mixer_module(struct snd_sof_widget *swidget,
struct sof_ipc4_available_audio_format *available_fmt = &mixer->available_fmt;
int ret;
- /* only 32bit is supported by mixer */
- available_fmt->ref_audio_fmt = available_fmt->input_pin_fmts;
-
- /* output format is not required to be sent to the FW for mixer */
ret = sof_ipc4_init_audio_fmt(sdev, swidget, &mixer->base_config,
- pipeline_params, available_fmt);
+ pipeline_params, available_fmt,
+ available_fmt->input_pin_fmts);
if (ret < 0)
return ret;
@@ -1405,11 +1401,9 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget,
struct snd_interval *rate;
int ret;
- available_fmt->ref_audio_fmt = available_fmt->input_pin_fmts;
-
- /* output format is not required to be sent to the FW for SRC */
ret = sof_ipc4_init_audio_fmt(sdev, swidget, &src->base_config,
- pipeline_params, available_fmt);
+ pipeline_params, available_fmt,
+ available_fmt->input_pin_fmts);
if (ret < 0)
return ret;
diff --git a/sound/soc/sof/ipc4-topology.h b/sound/soc/sof/ipc4-topology.h
index 2d9b1ba549f7..6359ef8736ae 100644
--- a/sound/soc/sof/ipc4-topology.h
+++ b/sound/soc/sof/ipc4-topology.h
@@ -164,13 +164,11 @@ struct sof_ipc4_pin_format {
* struct sof_ipc4_available_audio_format - Available audio formats
* @output_pin_fmts: Available output pin formats
* @input_pin_fmts: Available input pin formats
- * @ref_audio_fmt: Reference audio format to match runtime audio format
* @audio_fmt_num: Number of available audio formats
*/
struct sof_ipc4_available_audio_format {
struct sof_ipc4_pin_format *output_pin_fmts;
struct sof_ipc4_pin_format *input_pin_fmts;
- struct sof_ipc4_pin_format *ref_audio_fmt;
int audio_fmt_num;
};
--
2.39.2
next prev parent reply other threads:[~2023-03-13 12:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 12:48 [PATCH 00/11] ASoC: SOF: ipc4: Add support for formats per pins Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 01/11] ASoC: SOF: rename a couple of tokens Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 02/11] ASoC: SOF: Use input/output pin consistently Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 03/11] ASoC: SOF: ipc4-topology: Add a new field in struct sof_ipc4_available_audio_format Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 04/11] ASoC: SOF: ipc4-topology: Do not parse the DMA_BUFFER_SIZE token Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 05/11] ASoC: SOF: ipc4-topology: Parse the SOF_COMP_TOKENS only once Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 06/11] ASoC: SOF: ipc4-topology: Always parse the output formats in topology Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 07/11] ASoC: SOF: ipc4-topology: Modify the type of available input/output formats Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 08/11] ASoC: SOF: ipc4-topology: Modify the signature of sof_ipc4_init_audio_fmt() Peter Ujfalusi
2023-03-13 12:48 ` Peter Ujfalusi [this message]
2023-03-13 12:48 ` [PATCH 10/11] ASoC: SOF: ipc4-topology: Add new tokens for input/output pin format count Peter Ujfalusi
2023-03-13 12:48 ` [PATCH 11/11] ASoC: SOF: ipc4-topology: Search only pin 0 formats Peter Ujfalusi
2023-03-14 15:12 ` [PATCH 00/11] ASoC: SOF: ipc4: Add support for formats per pins Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230313124856.8140-10-peter.ujfalusi@linux.intel.com \
--to=peter.ujfalusi@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rander.wang@intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.