These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / platform / ti-vpe / vpe.c

diff --git a/kernel/drivers/media/platform/ti-vpe/vpe.c b/kernel/drivers/media/platform/ti-vpe/vpe.c
index c44760b..de24eff 100644 (file)
--- a/kernel/drivers/media/platform/ti-vpe/vpe.c
+++ b/kernel/drivers/media/platform/ti-vpe/vpe.c
@@ -40,7 +40,7 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-mem2mem.h>
-#include <media/videobuf2-core.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-contig.h>
 
 #include "vpdma.h"
@@ -384,8 +384,8 @@ struct vpe_ctx {
        unsigned int            bufs_completed;         /* bufs done in this batch */
 
        struct vpe_q_data       q_data[2];              /* src & dst queue data */
-       struct vb2_buffer       *src_vbs[VPE_MAX_SRC_BUFS];
-       struct vb2_buffer       *dst_vb;
+       struct vb2_v4l2_buffer  *src_vbs[VPE_MAX_SRC_BUFS];
+       struct vb2_v4l2_buffer  *dst_vb;
 
        dma_addr_t              mv_buf_dma[2];          /* dma addrs of motion vector in/out bufs */
        void                    *mv_buf[2];             /* virtual addrs of motion vector bufs */
@@ -988,7 +988,7 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port)
 {
        struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_DST];
        const struct vpe_port_data *p_data = &port_data[port];
-       struct vb2_buffer *vb = ctx->dst_vb;
+       struct vb2_buffer *vb = &ctx->dst_vb->vb2_buf;
        struct vpe_fmt *fmt = q_data->fmt;
        const struct vpdma_data_format *vpdma_fmt;
        int mv_buf_selector = !ctx->src_mv_buf_selector;
@@ -1025,11 +1025,12 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)
 {
        struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_SRC];
        const struct vpe_port_data *p_data = &port_data[port];
-       struct vb2_buffer *vb = ctx->src_vbs[p_data->vb_index];
+       struct vb2_buffer *vb = &ctx->src_vbs[p_data->vb_index]->vb2_buf;
+       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpe_fmt *fmt = q_data->fmt;
        const struct vpdma_data_format *vpdma_fmt;
        int mv_buf_selector = ctx->src_mv_buf_selector;
-       int field = vb->v4l2_buf.field == V4L2_FIELD_BOTTOM;
+       int field = vbuf->field == V4L2_FIELD_BOTTOM;
        int frame_width, frame_height;
        dma_addr_t dma_addr;
        u32 flags = 0;
@@ -1222,8 +1223,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
        struct vpe_dev *dev = (struct vpe_dev *)data;
        struct vpe_ctx *ctx;
        struct vpe_q_data *d_q_data;
-       struct vb2_buffer *s_vb, *d_vb;
-       struct v4l2_buffer *s_buf, *d_buf;
+       struct vb2_v4l2_buffer *s_vb, *d_vb;
        unsigned long flags;
        u32 irqst0, irqst1;
 
@@ -1286,20 +1286,18 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
 
        s_vb = ctx->src_vbs[0];
        d_vb = ctx->dst_vb;
-       s_buf = &s_vb->v4l2_buf;
-       d_buf = &d_vb->v4l2_buf;
 
-       d_buf->flags = s_buf->flags;
+       d_vb->flags = s_vb->flags;
+       d_vb->timestamp = s_vb->timestamp;
 
-       d_buf->timestamp = s_buf->timestamp;
-       if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE)
-               d_buf->timecode = s_buf->timecode;
+       if (s_vb->flags & V4L2_BUF_FLAG_TIMECODE)
+               d_vb->timecode = s_vb->timecode;
 
-       d_buf->sequence = ctx->sequence;
+       d_vb->sequence = ctx->sequence;
 
        d_q_data = &ctx->q_data[Q_DATA_DST];
        if (d_q_data->flags & Q_DATA_INTERLACED) {
-               d_buf->field = ctx->field;
+               d_vb->field = ctx->field;
                if (ctx->field == V4L2_FIELD_BOTTOM) {
                        ctx->sequence++;
                        ctx->field = V4L2_FIELD_TOP;
@@ -1308,7 +1306,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
                        ctx->field = V4L2_FIELD_BOTTOM;
                }
        } else {
-               d_buf->field = V4L2_FIELD_NONE;
+               d_vb->field = V4L2_FIELD_NONE;
                ctx->sequence++;
        }
 
@@ -1798,7 +1796,7 @@ static const struct v4l2_ioctl_ops vpe_ioctl_ops = {
  * Queue operations
  */
 static int vpe_queue_setup(struct vb2_queue *vq,
-                          const struct v4l2_format *fmt,
+                          const void *parg,
                           unsigned int *nbuffers, unsigned int *nplanes,
                           unsigned int sizes[], void *alloc_ctxs[])
 {
@@ -1825,6 +1823,7 @@ static int vpe_queue_setup(struct vb2_queue *vq,
 
 static int vpe_buf_prepare(struct vb2_buffer *vb)
 {
+       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        struct vpe_q_data *q_data;
        int i, num_planes;
@@ -1836,10 +1835,10 @@ static int vpe_buf_prepare(struct vb2_buffer *vb)
 
        if (vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
                if (!(q_data->flags & Q_DATA_INTERLACED)) {
-                       vb->v4l2_buf.field = V4L2_FIELD_NONE;
+                       vbuf->field = V4L2_FIELD_NONE;
                } else {
-                       if (vb->v4l2_buf.field != V4L2_FIELD_TOP &&
-                                       vb->v4l2_buf.field != V4L2_FIELD_BOTTOM)
+                       if (vbuf->field != V4L2_FIELD_TOP &&
+                                       vbuf->field != V4L2_FIELD_BOTTOM)
                                return -EINVAL;
                }
        }
@@ -1862,9 +1861,10 @@ static int vpe_buf_prepare(struct vb2_buffer *vb)
 
 static void vpe_buf_queue(struct vb2_buffer *vb)
 {
+       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
 
-       v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
+       v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
 }
 
 static int vpe_start_streaming(struct vb2_queue *q, unsigned int count)