V4L/DVB (6046): ivtv: always steal full frames if out of buffers.

When there are no more free buffers, then buffers are stolen from the
predma queue. Buffers should be stolen from the head of that queue (which
is where the most recently added buffers are) and all buffers belonging
to a frame should be stolen. Otherwise 'half-frames' would remain in the
queue, which leads to ugly playback and complete sync failure for YUV
buffers.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 0a1c16ad10bb..f5de2fd01b1a 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -356,7 +356,7 @@ struct ivtv_mailbox_data {
 };
 
 /* per-buffer bit flags */
-#define IVTV_F_B_NEED_BUF_SWAP  0       /* this buffer should be byte swapped */
+#define IVTV_F_B_NEED_BUF_SWAP  (1 << 0)        /* this buffer should be byte swapped */
 
 /* per-stream, s_flags */
 #define IVTV_F_S_DMA_PENDING    0       /* this stream has pending DMA */
@@ -437,7 +437,8 @@ struct ivtv_dma_page_info {
 struct ivtv_buffer {
         struct list_head list;
         dma_addr_t dma_handle;
-        unsigned long b_flags;
+        unsigned short b_flags;
+        unsigned short dma_xfer_cnt;
         char *buf;
 
         u32 bytesused;
@@ -487,6 +488,10 @@ struct ivtv_stream {
         struct ivtv_queue q_dma;        /* waiting for DMA */
         struct ivtv_queue q_predma;     /* waiting for DMA */
 
+        /* DMA xfer counter, buffers belonging to the same DMA
+           xfer will have the same dma_xfer_cnt. */
+        u16 dma_xfer_cnt;
+
         /* Base Dev SG Array for cx23415/6 */
         struct ivtv_SG_element *SGarray;
         struct ivtv_SG_element *PIOarray;