ASoC: MPC5200: Support for buffer wrap around
authorJohn Bonesio <bones@secretlab.ca>
Wed, 29 Jul 2009 15:38:55 +0000 (08:38 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Aug 2009 21:10:14 +0000 (22:10 +0100)
The code in psc_dma_bcom_enqueue_tx() didn't account for the fact that
s->runtime->control->appl_ptr can wrap around to the beginning of the
buffer. This change fixes this problem.

Signed-off-by: John Bonesio <bones@secretlab.ca>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/fsl/mpc5200_dma.c

index f0a2d407199815fcbfc0cc0b2b3483d91e7d85e8..9ff62e3a9b1d1c49a2938c3085f7182d18d8ea44 100644 (file)
@@ -69,6 +69,23 @@ static void psc_dma_bcom_enqueue_next_buffer(struct psc_dma_stream *s)
 
 static void psc_dma_bcom_enqueue_tx(struct psc_dma_stream *s)
 {
+       if (s->appl_ptr > s->runtime->control->appl_ptr) {
+               /*
+                * In this case s->runtime->control->appl_ptr has wrapped around.
+                * Play the data to the end of the boundary, then wrap our own
+                * appl_ptr back around.
+                */
+               while (s->appl_ptr < s->runtime->boundary) {
+                       if (bcom_queue_full(s->bcom_task))
+                               return;
+
+                       s->appl_ptr += s->period_size;
+
+                       psc_dma_bcom_enqueue_next_buffer(s);
+               }
+               s->appl_ptr -= s->runtime->boundary;
+       }
+
        while (s->appl_ptr < s->runtime->control->appl_ptr) {
 
                if (bcom_queue_full(s->bcom_task))