Commit 79452f0a authored by Takashi Iwai's avatar Takashi Iwai

ALSA: pcm - Fix regressions with VMware

VMware tends to report PCM positions and period updates at utterly
wrong timing.  This screws up the recent PCM core code that tries
to correct the position based on the irq timing.

Now, when a backward irq position is detected, skip the update
instead of rebasing.  (This is almost the old behavior before
2.6.30.)
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6847e154
...@@ -244,18 +244,27 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) ...@@ -244,18 +244,27 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
delta = new_hw_ptr - hw_ptr_interrupt; delta = new_hw_ptr - hw_ptr_interrupt;
} }
if (delta < 0) { if (delta < 0) {
delta += runtime->buffer_size; if (runtime->periods == 1)
delta += runtime->buffer_size;
if (delta < 0) { if (delta < 0) {
hw_ptr_error(substream, hw_ptr_error(substream,
"Unexpected hw_pointer value " "Unexpected hw_pointer value "
"(stream=%i, pos=%ld, intr_ptr=%ld)\n", "(stream=%i, pos=%ld, intr_ptr=%ld)\n",
substream->stream, (long)pos, substream->stream, (long)pos,
(long)hw_ptr_interrupt); (long)hw_ptr_interrupt);
#if 1
/* simply skipping the hwptr update seems more
* robust in some cases, e.g. on VMware with
* inaccurate timer source
*/
return 0; /* skip this update */
#else
/* rebase to interrupt position */ /* rebase to interrupt position */
hw_base = new_hw_ptr = hw_ptr_interrupt; hw_base = new_hw_ptr = hw_ptr_interrupt;
/* align hw_base to buffer_size */ /* align hw_base to buffer_size */
hw_base -= hw_base % runtime->buffer_size; hw_base -= hw_base % runtime->buffer_size;
delta = 0; delta = 0;
#endif
} else { } else {
hw_base += runtime->buffer_size; hw_base += runtime->buffer_size;
if (hw_base >= runtime->boundary) if (hw_base >= runtime->boundary)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment