Commit 258020d0 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: core: Add delay operation to snd_soc_dai_ops 



The delay callback can be used by the core to query the delay
on the dai caused by FIFO or delay in the platform side.
In case if both CPU and CODEC dai has FIFO the delay reported
by each will be added to form the full delay on the chain.
If none of the dai has FIFO, than the delay will be kept as
zero.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 377b6f62

include/sound/soc-dai.h

+6 −0
Original line number Diff line number Diff line
@@ -182,6 +182,12 @@ struct snd_soc_dai_ops { 
		struct snd_soc_dai *);

	int (*trigger)(struct snd_pcm_substream *, int,

		struct snd_soc_dai *);

	/*

	 * For hardware based FIFO caused delay reporting.

	 * Optional.

	 */

	snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,

		struct snd_soc_dai *);

};



/*

include/sound/soc.h

+7 −0
Original line number Diff line number Diff line
@@ -470,6 +470,13 @@ struct snd_soc_platform { 
		struct snd_pcm *);

	void (*pcm_free)(struct snd_pcm *);



	/*

	 * For platform caused delay reporting.

	 * Optional.

	 */

	snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,

		struct snd_soc_dai *);



	/* platform stream ops */

	struct snd_pcm_ops *pcm_ops;

};

sound/soc/soc-core.c

+18 −0
Original line number Diff line number Diff line
@@ -802,6 +802,8 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 


/*

 * soc level wrapper for pointer callback

 * If cpu_dai, codec_dai, platform driver has the delay callback, than

 * the runtime->delay will be updated accordingly.

 */

static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)

{
@@ -809,11 +811,27 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) 
	struct snd_soc_device *socdev = rtd->socdev;

	struct snd_soc_card *card = socdev->card;

	struct snd_soc_platform *platform = card->platform;

	struct snd_soc_dai_link *machine = rtd->dai;

	struct snd_soc_dai *cpu_dai = machine->cpu_dai;

	struct snd_soc_dai *codec_dai = machine->codec_dai;

	struct snd_pcm_runtime *runtime = substream->runtime;

	snd_pcm_uframes_t offset = 0;

	snd_pcm_sframes_t delay = 0;



	if (platform->pcm_ops->pointer)

		offset = platform->pcm_ops->pointer(substream);



	if (cpu_dai->ops->delay)

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



	if (codec_dai->ops->delay)

		delay += codec_dai->ops->delay(substream, codec_dai);



	if (platform->delay)

		delay += platform->delay(substream, codec_dai);



	runtime->delay = delay;



	return offset;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE