aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-22 06:51:51 -0400
committerTakashi Iwai <tiwai@suse.de>2009-07-22 06:55:56 -0400
commit79452f0a28aa5a40522c487b42a5fc423647ad98 (patch)
treecacc494ab214305e2bc3576c6221a8dd5a63a9ad /sound
parent6847e154e3cd74fca6084124c097980a7634285a (diff)
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/pcm_lib.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 333e4dd29450..3b673e2f991d 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -244,18 +244,27 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
244 delta = new_hw_ptr - hw_ptr_interrupt; 244 delta = new_hw_ptr - hw_ptr_interrupt;
245 } 245 }
246 if (delta < 0) { 246 if (delta < 0) {
247 delta += runtime->buffer_size; 247 if (runtime->periods == 1)
248 delta += runtime->buffer_size;
248 if (delta < 0) { 249 if (delta < 0) {
249 hw_ptr_error(substream, 250 hw_ptr_error(substream,
250 "Unexpected hw_pointer value " 251 "Unexpected hw_pointer value "
251 "(stream=%i, pos=%ld, intr_ptr=%ld)\n", 252 "(stream=%i, pos=%ld, intr_ptr=%ld)\n",
252 substream->stream, (long)pos, 253 substream->stream, (long)pos,
253 (long)hw_ptr_interrupt); 254 (long)hw_ptr_interrupt);
255#if 1
256 /* simply skipping the hwptr update seems more
257 * robust in some cases, e.g. on VMware with
258 * inaccurate timer source
259 */
260 return 0; /* skip this update */
261#else
254 /* rebase to interrupt position */ 262 /* rebase to interrupt position */
255 hw_base = new_hw_ptr = hw_ptr_interrupt; 263 hw_base = new_hw_ptr = hw_ptr_interrupt;
256 /* align hw_base to buffer_size */ 264 /* align hw_base to buffer_size */
257 hw_base -= hw_base % runtime->buffer_size; 265 hw_base -= hw_base % runtime->buffer_size;
258 delta = 0; 266 delta = 0;
267#endif
259 } else { 268 } else {
260 hw_base += runtime->buffer_size; 269 hw_base += runtime->buffer_size;
261 if (hw_base >= runtime->boundary) 270 if (hw_base >= runtime->boundary)