V4L/DVB (6713): ivtv: ivtv_yuv_prep_frame breakup and yuv hardware buffer changes

ivtv_yuv_prep_frame is split in smaller code blocks.

Modified yuv buffer handling on the PVR350 itself. We now cycle through all 8
hardware buffers.

With this patch in place, driver behaviour should remain unchanged from the
existing release.

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, 8 insertions, 3 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index b6dd2360e610..12ff9382718d 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -403,6 +403,8 @@ struct yuv_frame_info
 #define IVTV_YUV_SYNC_ODD               0x04
 #define IVTV_YUV_SYNC_MASK              0x04
 
+#define IVTV_YUV_BUFFERS 8
+
 struct yuv_playback_info
 {
         u32 reg_2834;
@@ -475,11 +477,11 @@ struct yuv_playback_info
         u32 yuv_forced_update;
         int update_frame;
 
-        int sync_field[4];  /* Field to sync on */
-        int field_delay[4]; /* Flag to extend duration of previous frame */
+        int sync_field[IVTV_YUV_BUFFERS];  /* Field to sync on */
+        int field_delay[IVTV_YUV_BUFFERS]; /* Flag to extend duration of previous frame */
         u8 fields_lapsed;   /* Counter used when delaying a frame */
 
-        struct yuv_frame_info new_frame_info[4];
+        struct yuv_frame_info new_frame_info[IVTV_YUV_BUFFERS];
         struct yuv_frame_info old_frame_info;
         struct yuv_frame_info old_frame_info_args;
 
@@ -487,6 +489,9 @@ struct yuv_playback_info
         dma_addr_t blanking_dmaptr;
 
         int stream_size;
+
+        u8 draw_frame; /* PVR350 buffer to draw into */
+        u8 max_frames_buffered; /* Maximum number of frames to buffer */
 };
 
 #define IVTV_VBI_FRAMES 32