mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'topic/intel8x0' into for-linus

Browse source 
* topic/intel8x0:
  ALSA: intel8x0 - Fix PCM position craziness
This commit is contained in:
Takashi Iwai 2009-06-16 17:38:46 +02:00
commit b909005ce1
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sound/pci/intel8x0.c
View file

@ -356,8 +356,6 @@ struct ichdev {
unsigned int position; unsigned int position;
unsigned int pos_shift; unsigned int pos_shift;
unsigned int last_pos; unsigned int last_pos;
unsigned long last_pos_jiffies;
unsigned int jiffy_to_bytes;
int frags; int frags;
int lvi; int lvi;
int lvi_frag; int lvi_frag;
@ -844,7 +842,6 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
val = ICH_IOCE | ICH_STARTBM; val = ICH_IOCE | ICH_STARTBM;
ichdev->last_pos = ichdev->position; ichdev->last_pos = ichdev->position;
ichdev->last_pos_jiffies = jiffies;
break; break;
case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_SUSPEND:
ichdev->suspended = 1; ichdev->suspended = 1;
@ -1048,7 +1045,6 @@ static int snd_intel8x0_pcm_prepare(struct snd_pcm_substream *substream)
ichdev->pos_shift = (runtime->sample_bits > 16) ? 2 : 1; ichdev->pos_shift = (runtime->sample_bits > 16) ? 2 : 1;
} }
snd_intel8x0_setup_periods(chip, ichdev); snd_intel8x0_setup_periods(chip, ichdev);
ichdev->jiffy_to_bytes = (runtime->rate * 4 * ichdev->pos_shift) / HZ;
return 0; return 0;
} }
@ -1073,19 +1069,23 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *subs
ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb)) ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb))
break; break;
} while (timeout--); } while (timeout--);
ptr = ichdev->last_pos;
if (ptr1 != 0) { if (ptr1 != 0) {
ptr1 <<= ichdev->pos_shift; ptr1 <<= ichdev->pos_shift;
ptr = ichdev->fragsize1 - ptr1; ptr = ichdev->fragsize1 - ptr1;
ptr += position; ptr += position;
ichdev->last_pos = ptr; if (ptr < ichdev->last_pos) {
ichdev->last_pos_jiffies = jiffies; unsigned int pos_base, last_base;
} else { pos_base = position / ichdev->fragsize1;
ptr1 = jiffies - ichdev->last_pos_jiffies; last_base = ichdev->last_pos / ichdev->fragsize1;
if (ptr1) /* another sanity check; ptr1 can go back to full
ptr1 -= 1; * before the base position is updated
ptr = ichdev->last_pos + ptr1 * ichdev->jiffy_to_bytes; */
ptr %= ichdev->size; if (pos_base == last_base)
ptr = ichdev->last_pos;
}
} }
ichdev->last_pos = ptr;
spin_unlock(&chip->reg_lock); spin_unlock(&chip->reg_lock);
if (ptr >= ichdev->size) if (ptr >= ichdev->size)
return 0; return 0;