[media] media: videobuf2: Restructure vb2_buffer

Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer.

Add new member variables - bytesused, length, offset, userptr, fd,
data_offset - to struct vb2_plane in order to cover all information
of v4l2_plane.
struct vb2_plane {
        <snip>
        unsigned int            bytesused;
        unsigned int            length;
        union {
                unsigned int    offset;
                unsigned long   userptr;
                int             fd;
        } m;
        unsigned int            data_offset;
}

Replace v4l2_buf with new member variables - index, type, memory - which
are common fields for buffer management.
struct vb2_buffer {
        <snip>
        unsigned int            index;
        unsigned int            type;
        unsigned int            memory;
        unsigned int            num_planes;
        struct vb2_plane        planes[VIDEO_MAX_PLANES];
        <snip>
};

v4l2 specific fields - flags, field, timestamp, timecode,
sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c
struct vb2_v4l2_buffer {
        struct vb2_buffer       vb2_buf;

        __u32                   flags;
        __u32                   field;
        struct timeval          timestamp;
        struct v4l2_timecode    timecode;
        __u32                   sequence;
};

Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 15 insertions, 11 deletions

diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index fe5c8ab06bd5..7967a75fde36 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -27,6 +27,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-mediabus.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-contig.h>
 
 /* Mirror addresses are not available for all registers */
@@ -62,11 +63,12 @@ enum sh_vou_status {
 #define VOU_MIN_IMAGE_HEIGHT    16
 
 struct sh_vou_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
         struct list_head list;
 };
 
-static inline struct sh_vou_buffer *to_sh_vou_buffer(struct vb2_buffer *vb2)
+static inline struct
+sh_vou_buffer *to_sh_vou_buffer(struct vb2_v4l2_buffer *vb2)
 {
         return container_of(vb2, struct sh_vou_buffer, vb);
 }
@@ -193,11 +195,11 @@ static struct sh_vou_fmt vou_fmt[] = {
 };
 
 static void sh_vou_schedule_next(struct sh_vou_device *vou_dev,
-                                 struct vb2_buffer *vb)
+                                 struct vb2_v4l2_buffer *vbuf)
 {
         dma_addr_t addr1, addr2;
 
-        addr1 = vb2_dma_contig_plane_dma_addr(vb, 0);
+        addr1 = vb2_dma_contig_plane_dma_addr(&vbuf->vb2_buf, 0);
         switch (vou_dev->pix.pixelformat) {
         case V4L2_PIX_FMT_NV12:
         case V4L2_PIX_FMT_NV16:
@@ -282,8 +284,9 @@ static int sh_vou_buf_prepare(struct vb2_buffer *vb)
 /* Locking: caller holds fop_lock mutex and vq->irqlock spinlock */
 static void sh_vou_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
         struct sh_vou_device *vou_dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct sh_vou_buffer *shbuf = to_sh_vou_buffer(vb);
+        struct sh_vou_buffer *shbuf = to_sh_vou_buffer(vbuf);
         unsigned long flags;
 
         spin_lock_irqsave(&vou_dev->lock, flags);
@@ -302,7 +305,8 @@ static int sh_vou_start_streaming(struct vb2_queue *vq, unsigned int count)
                                          video, s_stream, 1);
         if (ret < 0 && ret != -ENOIOCTLCMD) {
                 list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) {
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                         list_del(&buf->list);
                 }
                 vou_dev->active = NULL;
@@ -353,7 +357,7 @@ static void sh_vou_stop_streaming(struct vb2_queue *vq)
         msleep(50);
         spin_lock_irqsave(&vou_dev->lock, flags);
         list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) {
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                 list_del(&buf->list);
         }
         vou_dev->active = NULL;
@@ -1066,10 +1070,10 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id)
 
         list_del(&vb->list);
 
-        v4l2_get_timestamp(&vb->vb.v4l2_buf.timestamp);
-        vb->vb.v4l2_buf.sequence = vou_dev->sequence++;
-        vb->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
-        vb2_buffer_done(&vb->vb, VB2_BUF_STATE_DONE);
+        v4l2_get_timestamp(&vb->vb.timestamp);
+        vb->vb.sequence = vou_dev->sequence++;
+        vb->vb.field = V4L2_FIELD_INTERLACED;
+        vb2_buffer_done(&vb->vb.vb2_buf, VB2_BUF_STATE_DONE);
 
         vou_dev->active = list_entry(vou_dev->buf_list.next,
                                      struct sh_vou_buffer, list);