Unverified Commit 9fb4c2bf authored Aug 01, 2018 by Akshu Agrawal Committed by Mark Brown Aug 01, 2018

ASoC: soc-pcm: Use delay set in component pointer function



Take into account the base delay set in pointer callback.

There are cases where a pointer function populates
runtime->delay, such as:
./sound/pci/hda/hda_controller.c
./sound/soc/intel/atom/sst-mfld-platform-pcm.c

This delay was getting lost and was overwritten by delays
from codec or cpu dai delay function if exposed.

Now,
Total delay = base delay + cpu_dai delay + codec_dai delay

Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent b74fd690

sound/soc/soc-pcm.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1179,6 +1179,9 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
		snd_pcm_sframes_t codec_delay = 0;
		int i;

		/* clearing the previous total delay */
		runtime->delay = 0;

		for_each_rtdcom(rtd, rtdcom) {
		component = rtdcom->component;

		@@ -1190,6 +1193,8 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
		offset = component->driver->ops->pointer(substream);
		break;
		}
		/* base delay if assigned in pointer callback */
		delay = runtime->delay;

		if (cpu_dai->driver->ops->delay)
		delay += cpu_dai->driver->ops->delay(substream, cpu_dai);