V4L/DVB (6712): ivtv: ivtv yuv stream handling change

Currently the yuv output stream buffer is divided into blocks whose size
depend on the broadcast standard selected during the driver init phase.
However, the standard can be changed after the init phase. This effectively
breaks the yuv output stream handler, since it relies on the different yuv
planes being block aligned.

This patch changes the setup, so that the block size is always the same. The
decoder dma function has been modified to cope with the fact that the second
yuv plane may no longer be block aligned. The start of the yuv frame must
still be at the beginning of a block, so the stream write function has also
been modified to ensure this is always true.

Also, the stream write function will now initiate a yuv dma transfer as soon
as a full frame is ready. It will not wait until the current write request
has completed, or the stream buffer becomes full.

Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 19 insertions, 6 deletions

diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index fd1688e4757d..bcf1c85991af 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -313,15 +313,28 @@ void ivtv_dma_stream_dec_prepare(struct ivtv_stream *s, u32 offset, int lock)
         IVTV_DEBUG_HI_DMA("DEC PREPARE DMA %s: %08x %08x\n", s->name, s->q_predma.bytesused, offset);
         list_for_each_entry(buf, &s->q_predma.list, list) {
                 /* YUV UV Offset from Y Buffer */
-                if (s->type == IVTV_DEC_STREAM_TYPE_YUV && !y_done && bytes_written >= y_size) {
+                if (s->type == IVTV_DEC_STREAM_TYPE_YUV && !y_done &&
+                                (bytes_written + buf->bytesused) >= y_size) {
+                        s->sg_pending[idx].src = buf->dma_handle;
+                        s->sg_pending[idx].dst = offset;
+                        s->sg_pending[idx].size = y_size - bytes_written;
                         offset = uv_offset;
+                        if (s->sg_pending[idx].size != buf->bytesused) {
+                                idx++;
+                                s->sg_pending[idx].src =
+                                  buf->dma_handle + s->sg_pending[idx - 1].size;
+                                s->sg_pending[idx].dst = offset;
+                                s->sg_pending[idx].size =
+                                   buf->bytesused - s->sg_pending[idx - 1].size;
+                                offset += s->sg_pending[idx].size;
+                        }
                         y_done = 1;
+                } else {
+                        s->sg_pending[idx].src = buf->dma_handle;
+                        s->sg_pending[idx].dst = offset;
+                        s->sg_pending[idx].size = buf->bytesused;
+                        offset += buf->bytesused;
                 }
-                s->sg_pending[idx].src = buf->dma_handle;
-                s->sg_pending[idx].dst = offset;
-                s->sg_pending[idx].size = buf->bytesused;
-
-                offset += buf->bytesused;
                 bytes_written += buf->bytesused;
 
                 /* Sync SG buffers */