ASoC: SOF: ipc4-topology: Modify pipeline params based on SRC output format

Modify the pipeline_params based on the SRC output format and set the
sink_rate in the IPC data.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230821113629.5017-2-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index 633f6040d7128c6f2b9a422e66b712af32ccdc76..8bc12f12888d21cfeeaf6a32d73dd57b6afa97a2 100644 (file)
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -1838,10 +1838,10 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget,
        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 sof_ipc4_audio_format *out_audio_fmt;
        struct sof_ipc4_audio_format *in_fmt;
        u32 out_ref_rate, out_ref_channels, out_ref_valid_bits;
-       struct snd_interval *rate;
-       int ret;
+       int ret, output_format_index;
 
        ret = sof_ipc4_init_input_audio_fmt(sdev, swidget, &src->base_config,
                                            pipeline_params, available_fmt);
@@ -1853,22 +1853,23 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget,
        out_ref_channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(in_fmt->fmt_cfg);
        out_ref_valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(in_fmt->fmt_cfg);
 
-       ret = sof_ipc4_init_output_audio_fmt(sdev, &src->base_config, available_fmt,
-                                            out_ref_rate, out_ref_channels, out_ref_valid_bits);
-       if (ret < 0) {
+       output_format_index = sof_ipc4_init_output_audio_fmt(sdev, &src->base_config,
+                                                            available_fmt, out_ref_rate,
+                                                            out_ref_channels, out_ref_valid_bits);
+       if (output_format_index < 0) {
                dev_err(sdev->dev, "Failed to initialize output format for %s",
                        swidget->widget->name);
+               return output_format_index;
        }
 
        /* update pipeline memory usage */
        sof_ipc4_update_resource_usage(sdev, swidget, &src->base_config);
 
-       /* update pipeline_params for sink widgets */
-       rate = hw_param_interval(pipeline_params, SNDRV_PCM_HW_PARAM_RATE);
-       rate->min = src->sink_rate;
-       rate->max = rate->min;
+       out_audio_fmt = &available_fmt->output_pin_fmts[output_format_index].audio_fmt;
+       src->sink_rate = out_audio_fmt->sampling_frequency;
 
-       return 0;
+       /* update pipeline_params for sink widgets */
+       return sof_ipc4_update_hw_params(sdev, pipeline_params, out_audio_fmt);
 }
 
 static int