Unverified Commit 26e45506 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: Prefer 32-bit DMIC blobs for 8-bit formats as well 



With the introduction of 8-bit formats the DMIC blob lookup also needs to
be modified to prefer the 32-bit blob when 8-bit format is used on FE.

At the same time we also need to make sure that in case 8-bit format is
used, but only 16-bit blob is available for DMIC then we will not try to
look for 8-bit blob (which is invalid) as fallback, but for a 16-bit one.

Fixes: c04c2e82 ("ASoC: SOF: ipc4-topology: Add support for 8-bit formats")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarSeppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20251215120648.4827-2-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/ipc4-topology.c

+14 −8
Original line number Diff line number Diff line
@@ -1752,11 +1752,9 @@ snd_sof_get_nhlt_endpoint_data(struct snd_sof_dev *sdev, struct snd_sof_dai *dai 
		channel_count = params_channels(params);

		sample_rate = params_rate(params);

		bit_depth = params_width(params);

		/*

		 * Look for 32-bit blob first instead of 16-bit if copier

		 * supports multiple formats

		 */

		if (bit_depth == 16 && !single_bitdepth) {



		/* Prefer 32-bit blob if copier supports multiple formats */

		if (bit_depth <= 16 && !single_bitdepth) {

			dev_dbg(sdev->dev, "Looking for 32-bit blob first for DMIC\n");

			format_change = true;

			bit_depth = 32;
@@ -1799,10 +1797,18 @@ snd_sof_get_nhlt_endpoint_data(struct snd_sof_dev *sdev, struct snd_sof_dai *dai 
		if (format_change) {

			/*

			 * The 32-bit blob was not found in NHLT table, try to

			 * look for one based on the params

			 * look for 16-bit for DMIC or based on the params for

			 * SSP

			 */

			if (linktype == SOF_DAI_INTEL_DMIC) {

				bit_depth = 16;

				if (params_width(params) == 16)

					format_change = false;

			} else {

				bit_depth = params_width(params);

				format_change = false;

			}



			get_new_blob = true;

		} else if (linktype == SOF_DAI_INTEL_DMIC && !single_bitdepth) {

			/*