forked from luck/tmp_suning_uos_patched
ASoC: OMAP3: Report delay caused by the internal FIFO
Use the new delay calback function to report the delay through ALSA for application caused by the internal FIFO. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
7dc976ed38
commit
75581d2459
@ -256,6 +256,31 @@ static int omap_mcbsp_dai_trigger(struct snd_pcm_substream *substream, int cmd,
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static snd_pcm_sframes_t omap_mcbsp_dai_delay(
|
||||||
|
struct snd_pcm_substream *substream,
|
||||||
|
struct snd_soc_dai *dai)
|
||||||
|
{
|
||||||
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||||
|
struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
|
||||||
|
struct omap_mcbsp_data *mcbsp_data = to_mcbsp(cpu_dai->private_data);
|
||||||
|
u16 fifo_use;
|
||||||
|
snd_pcm_sframes_t delay;
|
||||||
|
|
||||||
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
||||||
|
fifo_use = omap_mcbsp_get_tx_delay(mcbsp_data->bus_id);
|
||||||
|
else
|
||||||
|
fifo_use = omap_mcbsp_get_rx_delay(mcbsp_data->bus_id);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Divide the used locations with the channel count to get the
|
||||||
|
* FIFO usage in samples (don't care about partial samples in the
|
||||||
|
* buffer).
|
||||||
|
*/
|
||||||
|
delay = fifo_use / substream->runtime->channels;
|
||||||
|
|
||||||
|
return delay;
|
||||||
|
}
|
||||||
|
|
||||||
static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
|
static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
|
||||||
struct snd_pcm_hw_params *params,
|
struct snd_pcm_hw_params *params,
|
||||||
struct snd_soc_dai *dai)
|
struct snd_soc_dai *dai)
|
||||||
@ -607,6 +632,7 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = {
|
|||||||
.startup = omap_mcbsp_dai_startup,
|
.startup = omap_mcbsp_dai_startup,
|
||||||
.shutdown = omap_mcbsp_dai_shutdown,
|
.shutdown = omap_mcbsp_dai_shutdown,
|
||||||
.trigger = omap_mcbsp_dai_trigger,
|
.trigger = omap_mcbsp_dai_trigger,
|
||||||
|
.delay = omap_mcbsp_dai_delay,
|
||||||
.hw_params = omap_mcbsp_dai_hw_params,
|
.hw_params = omap_mcbsp_dai_hw_params,
|
||||||
.set_fmt = omap_mcbsp_dai_set_dai_fmt,
|
.set_fmt = omap_mcbsp_dai_set_dai_fmt,
|
||||||
.set_clkdiv = omap_mcbsp_dai_set_clkdiv,
|
.set_clkdiv = omap_mcbsp_dai_set_clkdiv,
|
||||||
|
Loading…
Reference in New Issue
Block a user