]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: Intel: sof_rt5682: always set dpcm_capture for amplifiers
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Thu, 19 Jan 2023 16:34:56 +0000 (18:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Feb 2023 11:55:52 +0000 (12:55 +0100)
[ Upstream commit 324f065cdbaba1b879a63bf07e61ca156b789537 ]

The amplifier may provide hardware support for I/V feedback, or
alternatively the firmware may generate an echo reference attached to
the SSP and dailink used for the amplifier.

To avoid any issues with invalid/NULL substreams in the latter case,
always unconditionally set dpcm_capture.

Link: https://github.com/thesofproject/linux/issues/4083
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20230119163459.2235843-2-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/intel/boards/sof_rt5682.c

index 1f94fa5a15db6b5613e0bd4f45b00d31c6af442e..5883d1fa3b7edf4acf91c834e048cef3b9b57648 100644 (file)
@@ -704,6 +704,9 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
                links[id].num_platforms = ARRAY_SIZE(platform_component);
                links[id].nonatomic = true;
                links[id].dpcm_playback = 1;
+               /* feedback stream or firmware-generated echo reference */
+               links[id].dpcm_capture = 1;
+
                links[id].no_pcm = 1;
                links[id].cpus = &cpus[id];
                links[id].num_cpus = 1;