mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
ASoC: SOF: ipc4-topology: Add a new field in struct sof_ipc4_available_audio_format
Add a new field, input_audio_fmts, in struct sof_ipc4_available_audio_format and parse all the available input audio formats into this new field and not into the base_config field. This is preparation to remove the base_config array from the struct sof_ipc4_available_audio_format. This simplifies the sof_ipc4_init_audio_fmt() function as the reference audio format for matching with input params has the same size. 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-4-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan
Mark Brown
parent
bb79f2a608
commit
e63a73f94f
3 changed files with 65 additions and 58 deletions
|
|
@ -389,7 +389,7 @@ static int sof_ipc4_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
|
|||
snd_mask_none(fmt);
|
||||
snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S32_LE);
|
||||
|
||||
rate->min = ipc4_copier->available_fmt.base_config->audio_fmt.sampling_frequency;
|
||||
rate->min = ipc4_copier->available_fmt.input_audio_fmts->sampling_frequency;
|
||||
rate->max = rate->min;
|
||||
|
||||
switch (ipc4_copier->dai_type) {
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ static int sof_ipc4_get_audio_fmt(struct snd_soc_component *scomp,
|
|||
bool has_out_format)
|
||||
{
|
||||
struct sof_ipc4_base_module_cfg *base_config;
|
||||
struct sof_ipc4_audio_format *out_format;
|
||||
struct sof_ipc4_audio_format *out_format, *in_format;
|
||||
int audio_fmt_num = 0;
|
||||
int ret, i;
|
||||
|
||||
|
|
@ -206,7 +206,7 @@ static int sof_ipc4_get_audio_fmt(struct snd_soc_component *scomp,
|
|||
swidget->num_tuples, sizeof(*base_config), 1);
|
||||
if (ret) {
|
||||
dev_err(scomp->dev, "parse comp tokens failed %d\n", ret);
|
||||
goto err_in;
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ static int sof_ipc4_get_audio_fmt(struct snd_soc_component *scomp,
|
|||
available_fmt->audio_fmt_num);
|
||||
if (ret) {
|
||||
dev_err(scomp->dev, "parse buffer size tokens failed %d\n", ret);
|
||||
goto err_in;
|
||||
goto err;
|
||||
}
|
||||
|
||||
for (i = 0; i < available_fmt->audio_fmt_num; i++)
|
||||
|
|
@ -225,9 +225,17 @@ static int sof_ipc4_get_audio_fmt(struct snd_soc_component *scomp,
|
|||
base_config[i].ibs, base_config[i].obs,
|
||||
base_config[i].cpc, base_config[i].is_pages);
|
||||
|
||||
ret = sof_update_ipc_object(scomp, &base_config->audio_fmt,
|
||||
in_format = kcalloc(available_fmt->audio_fmt_num,
|
||||
sizeof(struct sof_ipc4_audio_format), GFP_KERNEL);
|
||||
if (!in_format) {
|
||||
kfree(base_config);
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = sof_update_ipc_object(scomp, available_fmt->input_audio_fmts,
|
||||
SOF_IN_AUDIO_FORMAT_TOKENS, swidget->tuples,
|
||||
swidget->num_tuples, sizeof(*base_config),
|
||||
swidget->num_tuples, sizeof(struct sof_ipc4_audio_format),
|
||||
available_fmt->audio_fmt_num);
|
||||
if (ret) {
|
||||
dev_err(scomp->dev, "parse base_config audio_fmt tokens failed %d\n", ret);
|
||||
|
|
@ -235,12 +243,10 @@ static int sof_ipc4_get_audio_fmt(struct snd_soc_component *scomp,
|
|||
}
|
||||
|
||||
dev_dbg(scomp->dev, "Get input audio formats for %s\n", swidget->widget->name);
|
||||
sof_ipc4_dbg_audio_format(scomp->dev, &base_config->audio_fmt,
|
||||
sizeof(*base_config),
|
||||
sof_ipc4_dbg_audio_format(scomp->dev, available_fmt->input_audio_fmts,
|
||||
sizeof(struct sof_ipc4_audio_format),
|
||||
available_fmt->audio_fmt_num);
|
||||
|
||||
available_fmt->base_config = base_config;
|
||||
|
||||
if (!has_out_format)
|
||||
return 0;
|
||||
|
||||
|
|
@ -260,18 +266,22 @@ static int sof_ipc4_get_audio_fmt(struct snd_soc_component *scomp,
|
|||
goto err_out;
|
||||
}
|
||||
|
||||
available_fmt->out_audio_fmt = out_format;
|
||||
dev_dbg(scomp->dev, "Get output audio formats for %s\n", swidget->widget->name);
|
||||
sof_ipc4_dbg_audio_format(scomp->dev, out_format, sizeof(*out_format),
|
||||
available_fmt->audio_fmt_num);
|
||||
|
||||
available_fmt->base_config = base_config;
|
||||
available_fmt->out_audio_fmt = out_format;
|
||||
available_fmt->input_audio_fmts = in_format;
|
||||
|
||||
return 0;
|
||||
|
||||
err_out:
|
||||
kfree(out_format);
|
||||
err_in:
|
||||
kfree(in_format);
|
||||
err:
|
||||
kfree(base_config);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -283,6 +293,8 @@ static void sof_ipc4_free_audio_fmt(struct sof_ipc4_available_audio_format *avai
|
|||
available_fmt->base_config = NULL;
|
||||
kfree(available_fmt->out_audio_fmt);
|
||||
available_fmt->out_audio_fmt = NULL;
|
||||
kfree(available_fmt->input_audio_fmts);
|
||||
available_fmt->input_audio_fmts = NULL;
|
||||
}
|
||||
|
||||
static void sof_ipc4_widget_free_comp_pipeline(struct snd_sof_widget *swidget)
|
||||
|
|
@ -904,17 +916,16 @@ static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,
|
|||
struct sof_ipc4_base_module_cfg *base_config,
|
||||
struct sof_ipc4_audio_format *out_format,
|
||||
struct snd_pcm_hw_params *params,
|
||||
struct sof_ipc4_available_audio_format *available_fmt,
|
||||
size_t object_offset)
|
||||
struct sof_ipc4_available_audio_format *available_fmt)
|
||||
{
|
||||
void *ptr = available_fmt->ref_audio_fmt;
|
||||
struct sof_ipc4_audio_format *fmt = available_fmt->ref_audio_fmt;
|
||||
u32 valid_bits;
|
||||
u32 channels;
|
||||
u32 rate;
|
||||
int sample_valid_bits;
|
||||
int i;
|
||||
|
||||
if (!ptr) {
|
||||
if (!fmt) {
|
||||
dev_err(sdev->dev, "no reference formats for %s\n", swidget->widget->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -943,25 +954,14 @@ static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,
|
|||
* Search supported audio formats to match rate, channels ,and
|
||||
* sample_valid_bytes from runtime params
|
||||
*/
|
||||
for (i = 0; i < available_fmt->audio_fmt_num; i++, ptr = (u8 *)ptr + object_offset) {
|
||||
struct sof_ipc4_audio_format *fmt = ptr;
|
||||
|
||||
for (i = 0; i < available_fmt->audio_fmt_num; i++, fmt++) {
|
||||
rate = fmt->sampling_frequency;
|
||||
channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg);
|
||||
valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
|
||||
if (params_rate(params) == rate && params_channels(params) == channels &&
|
||||
sample_valid_bits == valid_bits) {
|
||||
dev_dbg(sdev->dev, "matching audio format index for %uHz, %ubit, %u channels: %d\n",
|
||||
dev_dbg(sdev->dev, "matched audio format index for %uHz, %ubit, %u channels: %d\n",
|
||||
rate, valid_bits, channels, i);
|
||||
|
||||
/* copy ibs/obs and input format */
|
||||
memcpy(base_config, &available_fmt->base_config[i],
|
||||
sizeof(struct sof_ipc4_base_module_cfg));
|
||||
|
||||
/* copy output format */
|
||||
if (out_format)
|
||||
memcpy(out_format, &available_fmt->out_audio_fmt[i],
|
||||
sizeof(struct sof_ipc4_audio_format));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -972,10 +972,25 @@ static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* copy input format */
|
||||
memcpy(&base_config->audio_fmt, &available_fmt->input_audio_fmts[i], sizeof(*fmt));
|
||||
|
||||
/* set base_cfg ibs/obs */
|
||||
base_config->ibs = available_fmt->base_config[i].ibs;
|
||||
base_config->obs = available_fmt->base_config[i].obs;
|
||||
|
||||
dev_dbg(sdev->dev, "Init input audio formats for %s\n", swidget->widget->name);
|
||||
sof_ipc4_dbg_audio_format(sdev->dev, &base_config->audio_fmt,
|
||||
sizeof(*base_config), 1);
|
||||
if (out_format) {
|
||||
/*
|
||||
* Current topology defines pin 0 input and output formats only in pairs.
|
||||
* This assumes that the pin 0 formats are defined before all other pins.
|
||||
* So pick the output audio format with the same index as the chosen
|
||||
* input format. This logic will need to be updated when the format definitions
|
||||
* in topology change.
|
||||
*/
|
||||
memcpy(out_format, &available_fmt->out_audio_fmt[i], sizeof(*fmt));
|
||||
dev_dbg(sdev->dev, "Init output audio formats for %s\n", swidget->widget->name);
|
||||
sof_ipc4_dbg_audio_format(sdev->dev, out_format,
|
||||
sizeof(*out_format), 1);
|
||||
|
|
@ -1147,7 +1162,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
|
|||
struct snd_sof_dai *dai;
|
||||
struct snd_mask *fmt;
|
||||
int out_sample_valid_bits;
|
||||
size_t ref_audio_fmt_size;
|
||||
void **ipc_config_data;
|
||||
int *ipc_config_size;
|
||||
u32 **data;
|
||||
|
|
@ -1171,17 +1185,14 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
|
|||
available_fmt = &ipc4_copier->available_fmt;
|
||||
|
||||
/*
|
||||
* base_config->audio_fmt and out_audio_fmt represent the input and output audio
|
||||
* formats. Use the input format as the reference to match pcm params for playback
|
||||
* and the output format as reference for capture.
|
||||
* Use the input_audio_fmts to match pcm params for playback and the out_audio_fmt
|
||||
* for capture.
|
||||
*/
|
||||
if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||
available_fmt->ref_audio_fmt = &available_fmt->base_config->audio_fmt;
|
||||
ref_audio_fmt_size = sizeof(struct sof_ipc4_base_module_cfg);
|
||||
} else {
|
||||
if (dir == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
available_fmt->ref_audio_fmt = available_fmt->input_audio_fmts;
|
||||
else
|
||||
available_fmt->ref_audio_fmt = available_fmt->out_audio_fmt;
|
||||
ref_audio_fmt_size = sizeof(struct sof_ipc4_audio_format);
|
||||
}
|
||||
|
||||
copier_data->gtw_cfg.node_id &= ~SOF_IPC4_NODE_INDEX_MASK;
|
||||
copier_data->gtw_cfg.node_id |=
|
||||
SOF_IPC4_NODE_INDEX(platform_params->stream_tag - 1);
|
||||
|
|
@ -1201,7 +1212,6 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
|
|||
available_fmt = &ipc4_copier->available_fmt;
|
||||
if (dir == SNDRV_PCM_STREAM_CAPTURE) {
|
||||
available_fmt->ref_audio_fmt = available_fmt->out_audio_fmt;
|
||||
ref_audio_fmt_size = sizeof(struct sof_ipc4_audio_format);
|
||||
|
||||
/*
|
||||
* modify the input params for the dai copier as it only supports
|
||||
|
|
@ -1211,8 +1221,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->base_config->audio_fmt;
|
||||
ref_audio_fmt_size = sizeof(struct sof_ipc4_base_module_cfg);
|
||||
available_fmt->ref_audio_fmt = available_fmt->input_audio_fmts;
|
||||
}
|
||||
|
||||
ref_params = pipeline_params;
|
||||
|
|
@ -1232,12 +1241,8 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
|
|||
copier_data = &ipc4_copier->data;
|
||||
available_fmt = &ipc4_copier->available_fmt;
|
||||
|
||||
/*
|
||||
* base_config->audio_fmt represent the input audio formats. Use
|
||||
* the input format as the reference to match pcm params
|
||||
*/
|
||||
available_fmt->ref_audio_fmt = &available_fmt->base_config->audio_fmt;
|
||||
ref_audio_fmt_size = sizeof(struct sof_ipc4_base_module_cfg);
|
||||
/* Use the input formats as the reference to match pcm params */
|
||||
available_fmt->ref_audio_fmt = available_fmt->input_audio_fmts;
|
||||
ref_params = pipeline_params;
|
||||
|
||||
break;
|
||||
|
|
@ -1251,7 +1256,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,
|
||||
&copier_data->out_format, ref_params,
|
||||
available_fmt, ref_audio_fmt_size);
|
||||
available_fmt);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
|
|
@ -1400,14 +1405,14 @@ static int sof_ipc4_prepare_gain_module(struct snd_sof_widget *swidget,
|
|||
struct snd_soc_component *scomp = swidget->scomp;
|
||||
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
|
||||
struct sof_ipc4_gain *gain = swidget->private;
|
||||
struct sof_ipc4_available_audio_format *available_fmt = &gain->available_fmt;
|
||||
int ret;
|
||||
|
||||
gain->available_fmt.ref_audio_fmt = &gain->available_fmt.base_config->audio_fmt;
|
||||
available_fmt->ref_audio_fmt = available_fmt->input_audio_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,
|
||||
NULL, pipeline_params, &gain->available_fmt,
|
||||
sizeof(gain->base_config));
|
||||
NULL, pipeline_params, available_fmt);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
|
|
@ -1425,15 +1430,15 @@ static int sof_ipc4_prepare_mixer_module(struct snd_sof_widget *swidget,
|
|||
struct snd_soc_component *scomp = swidget->scomp;
|
||||
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
|
||||
struct sof_ipc4_mixer *mixer = swidget->private;
|
||||
struct sof_ipc4_available_audio_format *available_fmt = &mixer->available_fmt;
|
||||
int ret;
|
||||
|
||||
/* only 32bit is supported by mixer */
|
||||
mixer->available_fmt.ref_audio_fmt = &mixer->available_fmt.base_config->audio_fmt;
|
||||
available_fmt->ref_audio_fmt = available_fmt->input_audio_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,
|
||||
NULL, pipeline_params, &mixer->available_fmt,
|
||||
sizeof(mixer->base_config));
|
||||
NULL, pipeline_params, available_fmt);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
|
|
@ -1451,15 +1456,15 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget,
|
|||
struct snd_soc_component *scomp = swidget->scomp;
|
||||
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
|
||||
struct sof_ipc4_src *src = swidget->private;
|
||||
struct sof_ipc4_available_audio_format *available_fmt = &src->available_fmt;
|
||||
struct snd_interval *rate;
|
||||
int ret;
|
||||
|
||||
src->available_fmt.ref_audio_fmt = &src->available_fmt.base_config->audio_fmt;
|
||||
available_fmt->ref_audio_fmt = available_fmt->input_audio_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,
|
||||
NULL, pipeline_params, &src->available_fmt,
|
||||
sizeof(src->base_config));
|
||||
NULL, pipeline_params, available_fmt);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -146,6 +146,7 @@ struct ipc4_pipeline_set_state_data {
|
|||
* struct sof_ipc4_available_audio_format - Available audio formats
|
||||
* @base_config: Available base config
|
||||
* @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
|
||||
|
|
@ -153,6 +154,7 @@ struct ipc4_pipeline_set_state_data {
|
|||
struct sof_ipc4_available_audio_format {
|
||||
struct sof_ipc4_base_module_cfg *base_config;
|
||||
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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue