Skip to content

Commit 70b0924

Browse files
ranj063broonie
authored andcommitted
ASoC: SOF: ipc4-topology: Modify the reference output valid_bits for copier
If the copier has only output valid_bits across all its output formats, the reference for selecting the output format must be set that instead of the valid_bits from the selected input format. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Seppo Ingalsuo <seppo.ingalsuo@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/20230821113629.5017-5-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 769e8f6 commit 70b0924

1 file changed

Lines changed: 53 additions & 5 deletions

File tree

sound/soc/sof/ipc4-topology.c

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,6 +1349,31 @@ static int snd_sof_get_nhlt_endpoint_data(struct snd_sof_dev *sdev, struct snd_s
13491349
}
13501350
#endif
13511351

1352+
static bool sof_ipc4_copier_is_single_format(struct snd_sof_dev *sdev,
1353+
struct sof_ipc4_pin_format *pin_fmts,
1354+
u32 pin_fmts_size)
1355+
{
1356+
struct sof_ipc4_audio_format *fmt;
1357+
u32 valid_bits;
1358+
int i;
1359+
1360+
fmt = &pin_fmts[0].audio_fmt;
1361+
valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
1362+
1363+
/* check if all output formats in topology are the same */
1364+
for (i = 1; i < pin_fmts_size; i++) {
1365+
u32 _valid_bits;
1366+
1367+
fmt = &pin_fmts[i].audio_fmt;
1368+
_valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
1369+
1370+
if (_valid_bits != valid_bits)
1371+
return false;
1372+
}
1373+
1374+
return true;
1375+
}
1376+
13521377
static int
13531378
sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
13541379
struct snd_pcm_hw_params *fe_params,
@@ -1371,6 +1396,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
13711396
u32 out_ref_rate, out_ref_channels;
13721397
u32 deep_buffer_dma_ms = 0;
13731398
int output_fmt_index;
1399+
bool single_output_format;
13741400

13751401
dev_dbg(sdev->dev, "copier %s, type %d", swidget->widget->name, swidget->id);
13761402

@@ -1504,6 +1530,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
15041530
return ret;
15051531

15061532
/* set the reference params for output format selection */
1533+
single_output_format = sof_ipc4_copier_is_single_format(sdev,
1534+
available_fmt->output_pin_fmts,
1535+
available_fmt->num_output_formats);
15071536
switch (swidget->id) {
15081537
case snd_soc_dapm_aif_in:
15091538
case snd_soc_dapm_dai_out:
@@ -1514,17 +1543,21 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
15141543
in_fmt = &available_fmt->input_pin_fmts[ret].audio_fmt;
15151544
out_ref_rate = in_fmt->sampling_frequency;
15161545
out_ref_channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(in_fmt->fmt_cfg);
1517-
out_ref_valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(in_fmt->fmt_cfg);
1546+
1547+
if (!single_output_format)
1548+
out_ref_valid_bits =
1549+
SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(in_fmt->fmt_cfg);
15181550
break;
15191551
}
15201552
case snd_soc_dapm_aif_out:
15211553
case snd_soc_dapm_dai_in:
1522-
out_ref_valid_bits = sof_ipc4_get_valid_bits(sdev, fe_params);
1523-
if (out_ref_valid_bits < 0)
1524-
return out_ref_valid_bits;
1525-
15261554
out_ref_rate = params_rate(fe_params);
15271555
out_ref_channels = params_channels(fe_params);
1556+
if (!single_output_format) {
1557+
out_ref_valid_bits = sof_ipc4_get_valid_bits(sdev, fe_params);
1558+
if (out_ref_valid_bits < 0)
1559+
return out_ref_valid_bits;
1560+
}
15281561
break;
15291562
default:
15301563
/*
@@ -1534,6 +1567,21 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
15341567
return -EINVAL;
15351568
}
15361569

1570+
/*
1571+
* if the output format is the same across all available output formats, choose
1572+
* that as the reference.
1573+
*/
1574+
if (single_output_format) {
1575+
struct sof_ipc4_audio_format *out_fmt;
1576+
1577+
out_fmt = &available_fmt->output_pin_fmts[0].audio_fmt;
1578+
out_ref_valid_bits =
1579+
SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(out_fmt->fmt_cfg);
1580+
}
1581+
1582+
dev_dbg(sdev->dev, "copier %s: reference output rate %d, channels %d valid_bits %d\n",
1583+
swidget->widget->name, out_ref_rate, out_ref_channels, out_ref_valid_bits);
1584+
15371585
output_fmt_index = sof_ipc4_init_output_audio_fmt(sdev, &copier_data->base_config,
15381586
available_fmt, out_ref_rate,
15391587
out_ref_channels, out_ref_valid_bits);

0 commit comments

Comments
 (0)