Commit bd76af0f authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Takashi Iwai
Browse files

ALSA: pcm midlevel code - add time check for double interrupt acknowledge 



The current code in pcm_lib.c do all checks using only the position
in the ring buffer. Unfortunately, where the interrupts gets delayed or
merged into one, we need another timing source to check when the
buffer size boundary overlaps to avoid the wrong updating of the
ring buffer pointers.

This code uses jiffies to check the right time window without any
performance impact.

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e7cfbea9

include/sound/pcm.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ struct snd_pcm_runtime { 
	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */

	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */

	unsigned long hw_ptr_jiffies;	/* Time when hw_ptr is updated */

	unsigned long hw_ptr_buffer_jiffies; /* buffer time in jiffies */

	snd_pcm_sframes_t delay;	/* extra delay; typically FIFO size */



	/* -- HW params -- */

sound/core/pcm_lib.c

+9 −5
Original line number Diff line number Diff line
@@ -334,6 +334,9 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
		/* delta = "expected next hw_ptr" for in_interrupt != 0 */

		delta = runtime->hw_ptr_interrupt + runtime->period_size;

		if (delta > new_hw_ptr) {

			/* check for double acknowledged interrupts */

			hdelta = jiffies - runtime->hw_ptr_jiffies;

			if (hdelta > runtime->hw_ptr_buffer_jiffies/2) {

				hw_base += runtime->buffer_size;

				if (hw_base >= runtime->boundary)

					hw_base = 0;
@@ -341,6 +344,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
				goto __delta;

			}

		}

	}

	/* new_hw_ptr might be lower than old_hw_ptr in case when */

	/* pointer crosses the end of the ring buffer */

	if (new_hw_ptr < old_hw_ptr) {

sound/core/pcm_native.c

+2 −0
Original line number Diff line number Diff line
@@ -864,6 +864,8 @@ static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	snd_pcm_trigger_tstamp(substream);

	runtime->hw_ptr_jiffies = jiffies;

	runtime->hw_ptr_buffer_jiffies = (runtime->buffer_size * HZ) / 

							    runtime->rate;

	runtime->status->state = state;

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&

	    runtime->silence_size > 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE