[alsa-cvslog] alsa-kernel: Official ALSA project GIT repository for Linux 2.6 branch, master now at
Brought to you by:
perex
From: <nor...@al...> - 2009-04-21 14:02:56
|
Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 30fd9940eee910d847f48bd8740b2d0eaa8d2cfc (commit) via e10f9d87c9ac9fdfadb6305dbbc9052e49a02fdd (commit) from 2ec775e7053c82bc90858ede011b35aeb416995b (commit) - Log ----------------------------------------------------------------- commit 30fd9940eee910d847f48bd8740b2d0eaa8d2cfc Author: Jaroslav Kysela <pe...@pe...> AuthorDate: Tue Apr 21 15:30:31 2009 +0200 Commit: Jaroslav Kysela <pe...@pe...> CommitDate: Tue Apr 21 15:36:58 2009 +0200 [ALSA] intel8x0: another attempt to fix ac97_clock measure routine Appearently, a big delay ~300ms is required before hw is settled and ready to transfer samples on some hardware variants. Also, return back "clocking to 48000Hz" message when something fails. Signed-off-by: Jaroslav Kysela <pe...@pe...> commit e10f9d87c9ac9fdfadb6305dbbc9052e49a02fdd Author: Jaroslav Kysela <pe...@pe...> AuthorDate: Tue Apr 21 15:17:54 2009 +0200 Commit: Jaroslav Kysela <pe...@pe...> CommitDate: Tue Apr 21 15:17:54 2009 +0200 [ALSA] ac97_codec: increase timeout for analog subsections On some hardware platforms, the AC97 codec requires more time to wake up. Signed-off-by: Jaroslav Kysela <pe...@pe...> ----------------------------------------------------------------------- Diffstat: sound/pci/ac97/ac97_codec.c | 2 +- sound/pci/intel8x0.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) Patch -------------- (max 1500 lines) diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 97ee127..78288db 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -2122,7 +2122,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, } /* nothing should be in powerdown mode */ snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0); - end_time = jiffies + msecs_to_jiffies(100); + end_time = jiffies + msecs_to_jiffies(120); do { if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f) goto __ready_ok; diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 5dced5b..c4ba486 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -2751,11 +2751,12 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) if (pos == 0) { snd_printk(KERN_ERR "intel8x0: measure - unreliable DMA position..\n"); __retry: - if (attempt < 2) { + if (attempt < 3) { + msleep(300); attempt++; goto __again; } - return; + goto __end; } pos /= 4; @@ -2782,6 +2783,7 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) else if (pos < 47500 || pos > 48500) /* not 48000Hz, tuning the clock.. */ chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos; + __end: printk(KERN_INFO "intel8x0: clocking to %d\n", chip->ac97_bus->clock); snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0); } ------- End of patch hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 2ec775e7053c82bc90858ede011b35aeb416995b \ 30fd9940eee910d847f48bd8740b2d0eaa8d2cfc |