[Openvortex-dev] [PATCH 1/6] au88x0: add resetup dma

[Jeff Muizelaar]

Add adbdma_resetup for refreshing the hw page table on pcm start

Signed-off-by: Jeff Muizelaar <address@hidden>

diff -ur 2.6.10-alsa/sound/pci/au88x0/au88x0_core.c 
2.6.10-resetup/sound/pci/au88x0/au88x0_core.c
--- 2.6.10-alsa/sound/pci/au88x0/au88x0_core.c  2004-10-23 16:37:21 -0400
+++ 2.6.10-resetup/sound/pci/au88x0/au88x0_core.c       2004-10-24 17:58:42 
-0400
@@ -1223,6 +1223,33 @@
        return delta;
 }
 
+
+static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma) {
+       stream_t *dma = &vortex->dma_adb[adbdma];
+       int p, pp, i;
+
+       /* refresh hw page table */
+       for (i=0 ; i < 4 && i < dma->nr_periods; i++) {
+               /* p: audio buffer page index */
+               p = dma->period_virt + i;
+               if (p >= dma->nr_periods)
+                       p -= dma->nr_periods;
+               /* pp: hardware DMA page index. */
+               pp = dma->period_real + i;
+               if (dma->nr_periods < 4) {
+                       if (pp >= dma->nr_periods)
+                               pp -= dma->nr_periods;
+               }
+               else {
+                       if (pp >= 4)
+                               pp -= 4;
+               }
+               hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFBASE+(((adbdma << 2)+pp) 
<< 2), snd_sgbuf_get_addr(dma->sgbuf, dma->period_bytes * p));
+               /* Force write thru cache. */
+               hwread(vortex->mmio, VORTEX_ADBDMA_BUFBASE + (((adbdma << 
2)+pp) << 2));
+       }
+}
+
 static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
 {
        stream_t *dma = &vortex->dma_adb[adbdma];
diff -ur 2.6.10-alsa/sound/pci/au88x0/au88x0.h 
2.6.10-resetup/sound/pci/au88x0/au88x0.h
--- 2.6.10-alsa/sound/pci/au88x0/au88x0.h       2004-10-23 16:37:21 -0400
+++ 2.6.10-resetup/sound/pci/au88x0/au88x0.h    2004-10-24 18:00:01 -0400
@@ -208,6 +208,7 @@
 static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma);
 static void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma);
 static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma);
+static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma);
 
 #ifndef CHIP_AU8810
 static void vortex_wtdma_startfifo(vortex_t * vortex, int wtdma);
diff -ur 2.6.10-alsa/sound/pci/au88x0/au88x0_pcm.c 
2.6.10-resetup/sound/pci/au88x0/au88x0_pcm.c
--- 2.6.10-alsa/sound/pci/au88x0/au88x0_pcm.c   2004-10-23 16:37:21 -0400
+++ 2.6.10-resetup/sound/pci/au88x0/au88x0_pcm.c        2004-10-24 17:57:48 
-0400
@@ -313,8 +313,10 @@
                // do something to start the PCM engine
                //printk(KERN_INFO "vortex: start %d\n", dma);
                stream->fifo_enabled = 1;
-               if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT)
+               if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) {
+                       vortex_adbdma_resetup(chip, dma);
                        vortex_adbdma_startfifo(chip, dma);
+               }
 #ifndef CHIP_AU8810
                else {
                        printk(KERN_INFO "vortex: wt start %d\n", dma);