Skip to contentSkip to conversation

ASoC: amd: acp-legacy-mach: skip dai link for amp reference stream

PATCH In review Niranjan Holalu Yogendra 2 participants 2 messages Oct 6 – Oct 7

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: amd: acp-legacy-mach: skip dai link for amp reference stream

From: Niranjan H Y <[email protected]>

Amps can provide reference stream to hosts DSP which
can be used for input audio proocessing. But legacy AMD soc doesn't support such a feature. So skip adding the dai link for the same.

---
 sound/soc/amd/acp/acp-sdw-legacy-mach.c | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
sound/soc/amd/acp/acp-sdw-legacy-mach.c +32 -0
index 1a05d4288..a8b62817b 100644
@@ -265,6 +265,14 @@ static int create_sdw_dailink(struct snd_soc_card *card,
 			if (!soc_end->dai_info->direction[stream])
 				continue;
 
+			/*
+			 * skip adding reference stream for amp type
+			 * as legacy AMD doesn't use the DSP.
+			 */
+			if (soc_end->dai_info->dai_type == SOC_SDW_DAI_TYPE_AMP &&
+			    stream == SNDRV_PCM_STREAM_CAPTURE)
+				continue;
+
 			int link_num = ffs(soc_end->link_mask) - 1;
 
 			cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
@@ -448,6 +456,30 @@ static int soc_card_dai_links_create(struct snd_soc_card *card)
 
 	sdw_be_num = ret;
 
+	/*
+	 * Legacy AMD has no DSP, so AMP reference capture streams are not
+	 * supported. Subtract them from num_devs so create_sdw_dailink()
+	 * uses the correct count directly, and decrement sdw_be_num when
+	 * all capture endpoints on a DAI are AMP type.
+	 */
+	for (int i = 0; i < num_ends; i++) {
+		struct asoc_sdw_dailink *d = &soc_dais[i];
+		struct asoc_sdw_endpoint *e;
+
+		if (!d->initialised)
+			break;
+		if (!d->num_devs[SNDRV_PCM_STREAM_CAPTURE])
+			continue;
+
+		list_for_each_entry(e, &d->endpoints, list) {
+			if (e->dai_info->direction[SNDRV_PCM_STREAM_CAPTURE] &&
+			    e->dai_info->dai_type == SOC_SDW_DAI_TYPE_AMP)
+				d->num_devs[SNDRV_PCM_STREAM_CAPTURE]--;
+		}
+		if (!d->num_devs[SNDRV_PCM_STREAM_CAPTURE])
+			sdw_be_num--;
+	}
+
 	/* enable dmic */
 	if (soc_sdw_quirk & ASOC_SDW_ACP_DMIC)
 		dmic_num = 1;
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 1 line · Niranjan Holalu Yogendra

ASoC: amd: acp-legacy-mach: skip dai link for amp reference stream

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.4

Thanks!

[1/1] ASoC: amd: acp-legacy-mach: skip dai link for amp reference stream

      https://git.kernel.org/broonie/sound/c/9867312e9fd2

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark