V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address

[safe/jmp/linux-2.6] / drivers / media / video / cx18 / cx18-queue.c

diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index c1a49ec..8884537 100644 (file)
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -4,7 +4,7 @@
  *  Derived from ivtv-queue.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -100,8 +100,8 @@ struct cx18_mdl *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q)
        return mdl;
 }
 
-static void _cx18_mdl_set_buf_bytesused(struct cx18_stream *s,
-                                       struct cx18_mdl *mdl)
+static void _cx18_mdl_update_bufs_for_cpu(struct cx18_stream *s,
+                                         struct cx18_mdl *mdl)
 {
        struct cx18_buffer *buf;
        u32 buf_size = s->buf_size;
@@ -116,11 +116,12 @@ static void _cx18_mdl_set_buf_bytesused(struct cx18_stream *s,
                        buf->bytesused = bytesused;
                        bytesused = 0;
                }
+               cx18_buf_sync_for_cpu(s, buf);
        }
 }
 
-static inline void cx18_mdl_set_buf_bytesused(struct cx18_stream *s,
-                                             struct cx18_mdl *mdl)
+static inline void cx18_mdl_update_bufs_for_cpu(struct cx18_stream *s,
+                                               struct cx18_mdl *mdl)
 {
        struct cx18_buffer *buf;
 
@@ -129,8 +130,9 @@ static inline void cx18_mdl_set_buf_bytesused(struct cx18_stream *s,
                                       list);
                buf->bytesused = mdl->bytesused;
                buf->readpos = 0;
+               cx18_buf_sync_for_cpu(s, buf);
        } else {
-               _cx18_mdl_set_buf_bytesused(s, mdl);
+               _cx18_mdl_update_bufs_for_cpu(s, mdl);
        }
 }
 
@@ -191,8 +193,7 @@ struct cx18_mdl *cx18_queue_get_mdl(struct cx18_stream *s, u32 id,
                ret->bytesused = bytesused;
                ret->skipped = 0;
                /* 0'ed readpos, m_flags & curr_buf when mdl went on q_busy */
-               cx18_mdl_set_buf_bytesused(s, ret);
-               cx18_mdl_sync_for_cpu(s, ret);
+               cx18_mdl_update_bufs_for_cpu(s, ret);
                if (s->type != CX18_ENC_STREAM_TYPE_TS)
                        set_bit(CX18_F_M_NEED_SWAP, &ret->m_flags);
        }
@@ -280,6 +281,7 @@ void cx18_load_queues(struct cx18_stream *s)
        struct cx18_buffer *buf;
        int mdl_id;
        int i;
+       u32 partial_buf_size;
 
        /*
         * Attach buffers to MDLs, give the MDLs ids, and add MDLs to q_free
@@ -308,26 +310,28 @@ void cx18_load_queues(struct cx18_stream *s)
                                    &cx->scb->cpu_mdl[mdl_id + i].length);
                }
 
-               if (i == s->bufs_per_mdl)
+               if (i == s->bufs_per_mdl) {
+                       /*
+                        * The encoder doesn't honor s->mdl_size.  So in the
+                        * case of a non-integral number of buffers to meet
+                        * mdl_size, we lie about the size of the last buffer
+                        * in the MDL to get the encoder to really only send
+                        * us mdl_size bytes per MDL transfer.
+                        */
+                       partial_buf_size = s->mdl_size % s->buf_size;
+                       if (partial_buf_size) {
+                               cx18_writel(cx, partial_buf_size,
+                                     &cx->scb->cpu_mdl[mdl_id + i - 1].length);
+                       }
                        cx18_enqueue(s, mdl, &s->q_free);
-               else
-                       cx18_push(s, mdl, &s->q_idle); /* not enough buffers */
+               } else {
+                       /* Not enough buffers for this MDL; we won't use it */
+                       cx18_push(s, mdl, &s->q_idle);
+               }
                mdl_id += i;
        }
 }
 
-void _cx18_mdl_sync_for_cpu(struct cx18_stream *s, struct cx18_mdl *mdl)
-{
-       int dma = s->dma;
-       u32 buf_size = s->buf_size;
-       struct pci_dev *pci_dev = s->cx->pci_dev;
-       struct cx18_buffer *buf;
-
-       list_for_each_entry(buf, &mdl->buf_list, list)
-               pci_dma_sync_single_for_cpu(pci_dev, buf->dma_handle,
-                                           buf_size, dma);
-}
-
 void _cx18_mdl_sync_for_device(struct cx18_stream *s, struct cx18_mdl *mdl)
 {
        int dma = s->dma;
@@ -348,9 +352,11 @@ int cx18_stream_alloc(struct cx18_stream *s)
        if (s->buffers == 0)
                return 0;
 
-       CX18_DEBUG_INFO("Allocate %s stream: %d x %d buffers (%dkB total)\n",
+       CX18_DEBUG_INFO("Allocate %s stream: %d x %d buffers "
+                       "(%d.%02d kB total)\n",
                s->name, s->buffers, s->buf_size,
-               s->buffers * s->buf_size / 1024);
+               s->buffers * s->buf_size / 1024,
+               (s->buffers * s->buf_size * 100 / 1024) % 100);
 
        if (((char __iomem *)&cx->scb->cpu_mdl[cx->free_mdl_idx + s->buffers] -
                                (char __iomem *)cx->scb) > SCB_RESERVED_SIZE) {
@@ -413,6 +419,9 @@ void cx18_stream_free(struct cx18_stream *s)
 {
        struct cx18_mdl *mdl;
        struct cx18_buffer *buf;
+       struct cx18 *cx = s->cx;
+
+       CX18_DEBUG_INFO("Deallocating buffers for %s stream\n", s->name);
 
        /* move all buffers to buf_pool and all MDLs to q_idle */
        cx18_unload_queues(s);