Unverified Commit 37ec7ab4 authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: use common helper function in copier prepare 



Use the ipc4_set_fmt_mask() helper function instead of open-coding
the logic in multiple places.

Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230316141458.13940-3-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 279e52d6

sound/soc/sof/ipc4-topology.c

+3 −15
Original line number Diff line number Diff line
@@ -1363,21 +1363,9 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 
	out_sample_valid_bits =

		SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(copier_data->out_format.fmt_cfg);

	snd_mask_none(fmt);

	switch (out_sample_valid_bits) {

	case 16:

		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);

		break;

	case 24:

		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);

		break;

	case 32:

		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S32_LE);

		break;

	default:

		dev_err(sdev->dev, "invalid sample frame format %d\n",

			params_format(pipeline_params));

		return -EINVAL;

	}

	ret = ipc4_set_fmt_mask(fmt, out_sample_valid_bits);

	if (ret)

		return ret;



	/*

	 * Set the gateway dma_buffer_size to 2ms buffer size to meet the FW expectation. In the