aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/au88x0
diff options
context:
space:
mode:
authorRaymond Yau <superquad.vortex2@gmail.com>2011-02-14 07:33:24 +0800
committerTakashi Iwai <tiwai@suse.de>2011-02-14 17:13:20 +0100
commit5e5677f239ba69fc718ec9a87ac4ba035dafe2c0 (patch)
treedaab07aee2d37b1ccdeaa889c075175ec766828d /sound/pci/au88x0
parent61461241187c9903382f98620b26b201df521c82 (diff)
downloadkernel_samsung_smdk4412-5e5677f239ba69fc718ec9a87ac4ba035dafe2c0.zip
kernel_samsung_smdk4412-5e5677f239ba69fc718ec9a87ac4ba035dafe2c0.tar.gz
kernel_samsung_smdk4412-5e5677f239ba69fc718ec9a87ac4ba035dafe2c0.tar.bz2
ALSA: au88x0 - Modify pointer callback to give accurate playback position
Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/au88x0')
-rw-r--r--sound/pci/au88x0/au88x0_core.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 23f49f3..16c0bdf 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -1252,11 +1252,19 @@ static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma) {
static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
{
stream_t *dma = &vortex->dma_adb[adbdma];
- int temp;
+ int temp, page, delta;
temp = hwread(vortex->mmio, VORTEX_ADBDMA_STAT + (adbdma << 2));
- temp = (dma->period_virt * dma->period_bytes) + (temp & (dma->period_bytes - 1));
- return temp;
+ page = (temp & ADB_SUBBUF_MASK) >> ADB_SUBBUF_SHIFT;
+ if (dma->nr_periods >= 4)
+ delta = (page - dma->period_real) & 3;
+ else {
+ delta = (page - dma->period_real);
+ if (delta < 0)
+ delta += dma->nr_periods;
+ }
+ return (dma->period_virt + delta) * dma->period_bytes
+ + (temp & (dma->period_bytes - 1));
}
static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma)