1 files changed, 73 insertions, 22 deletions

diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index 08e24379b794..4f3096b17066 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -60,9 +60,7 @@ MODULE_PARM_DESC(debug, "activates debug info");
 #define MEM2MEM_VID_MEM_LIMIT   (16 * 1024 * 1024)
 
 /* Default transaction time in msec */
-#define MEM2MEM_DEF_TRANSTIME   1000
-/* Default number of buffers per transaction */
-#define MEM2MEM_DEF_TRANSLEN    1
+#define MEM2MEM_DEF_TRANSTIME   40
 #define MEM2MEM_COLOR_STEP      (0xff >> 4)
 #define MEM2MEM_NUM_TILES       8
 
@@ -114,6 +112,7 @@ struct m2mtest_q_data {
         unsigned int            width;
         unsigned int            height;
         unsigned int            sizeimage;
+        unsigned int            sequence;
         struct m2mtest_fmt      *fmt;
 };
 
@@ -236,9 +235,21 @@ static int device_process(struct m2mtest_ctx *ctx,
         bytes_left = bytesperline - tile_w * MEM2MEM_NUM_TILES;
         w = 0;
 
+        out_vb->v4l2_buf.sequence = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE)->sequence++;
+        in_vb->v4l2_buf.sequence = q_data->sequence++;
         memcpy(&out_vb->v4l2_buf.timestamp,
                         &in_vb->v4l2_buf.timestamp,
                         sizeof(struct timeval));
+        if (in_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TIMECODE)
+                memcpy(&out_vb->v4l2_buf.timecode, &in_vb->v4l2_buf.timecode,
+                        sizeof(struct v4l2_timecode));
+        out_vb->v4l2_buf.field = in_vb->v4l2_buf.field;
+        out_vb->v4l2_buf.flags = in_vb->v4l2_buf.flags &
+                (V4L2_BUF_FLAG_TIMECODE |
+                 V4L2_BUF_FLAG_KEYFRAME |
+                 V4L2_BUF_FLAG_PFRAME |
+                 V4L2_BUF_FLAG_BFRAME |
+                 V4L2_BUF_FLAG_TSTAMP_SRC_MASK);
 
         switch (ctx->mode) {
         case MEM2MEM_HFLIP | MEM2MEM_VFLIP:
@@ -505,19 +516,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
 
 static int vidioc_try_fmt(struct v4l2_format *f, struct m2mtest_fmt *fmt)
 {
-        enum v4l2_field field;
-
-        field = f->fmt.pix.field;
-
-        if (field == V4L2_FIELD_ANY)
-                field = V4L2_FIELD_NONE;
-        else if (V4L2_FIELD_NONE != field)
-                return -EINVAL;
-
         /* V4L2 specification suggests the driver corrects the format struct
          * if any of the dimensions is unsupported */
-        f->fmt.pix.field = field;
-
         if (f->fmt.pix.height < MIN_H)
                 f->fmt.pix.height = MIN_H;
         else if (f->fmt.pix.height > MAX_H)
@@ -531,6 +531,8 @@ static int vidioc_try_fmt(struct v4l2_format *f, struct m2mtest_fmt *fmt)
         f->fmt.pix.width &= ~DIM_ALIGN_MASK;
         f->fmt.pix.bytesperline = (f->fmt.pix.width * fmt->depth) >> 3;
         f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
+        f->fmt.pix.field = V4L2_FIELD_NONE;
+        f->fmt.pix.priv = 0;
 
         return 0;
 }
@@ -542,7 +544,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
         struct m2mtest_ctx *ctx = file2ctx(file);
 
         fmt = find_format(f);
-        if (!fmt || !(fmt->types & MEM2MEM_CAPTURE)) {
+        if (!fmt) {
+                f->fmt.pix.pixelformat = formats[0].fourcc;
+                fmt = find_format(f);
+        }
+        if (!(fmt->types & MEM2MEM_CAPTURE)) {
                 v4l2_err(&ctx->dev->v4l2_dev,
                          "Fourcc format (0x%08x) invalid.\n",
                          f->fmt.pix.pixelformat);
@@ -560,7 +566,11 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
         struct m2mtest_ctx *ctx = file2ctx(file);
 
         fmt = find_format(f);
-        if (!fmt || !(fmt->types & MEM2MEM_OUTPUT)) {
+        if (!fmt) {
+                f->fmt.pix.pixelformat = formats[0].fourcc;
+                fmt = find_format(f);
+        }
+        if (!(fmt->types & MEM2MEM_OUTPUT)) {
                 v4l2_err(&ctx->dev->v4l2_dev,
                          "Fourcc format (0x%08x) invalid.\n",
                          f->fmt.pix.pixelformat);
@@ -740,6 +750,15 @@ static int m2mtest_buf_prepare(struct vb2_buffer *vb)
         dprintk(ctx->dev, "type: %d\n", vb->vb2_queue->type);
 
         q_data = get_q_data(ctx, vb->vb2_queue->type);
+        if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
+                if (vb->v4l2_buf.field == V4L2_FIELD_ANY)
+                        vb->v4l2_buf.field = V4L2_FIELD_NONE;
+                if (vb->v4l2_buf.field != V4L2_FIELD_NONE) {
+                        dprintk(ctx->dev, "%s field isn't supported\n",
+                                        __func__);
+                        return -EINVAL;
+                }
+        }
 
         if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
                 dprintk(ctx->dev, "%s data will not fit into plane (%lu < %lu)\n",
@@ -755,13 +774,45 @@ static int m2mtest_buf_prepare(struct vb2_buffer *vb)
 static void m2mtest_buf_queue(struct vb2_buffer *vb)
 {
         struct m2mtest_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+
         v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
 }
 
+static int m2mtest_start_streaming(struct vb2_queue *q, unsigned count)
+{
+        struct m2mtest_ctx *ctx = vb2_get_drv_priv(q);
+        struct m2mtest_q_data *q_data = get_q_data(ctx, q->type);
+
+        q_data->sequence = 0;
+        return 0;
+}
+
+static int m2mtest_stop_streaming(struct vb2_queue *q)
+{
+        struct m2mtest_ctx *ctx = vb2_get_drv_priv(q);
+        struct vb2_buffer *vb;
+        unsigned long flags;
+
+        for (;;) {
+                if (V4L2_TYPE_IS_OUTPUT(q->type))
+                        vb = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
+                else
+                        vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
+                if (vb == NULL)
+                        return 0;
+                spin_lock_irqsave(&ctx->dev->irqlock, flags);
+                v4l2_m2m_buf_done(vb, VB2_BUF_STATE_ERROR);
+                spin_unlock_irqrestore(&ctx->dev->irqlock, flags);
+        }
+        return 0;
+}
+
 static struct vb2_ops m2mtest_qops = {
         .queue_setup     = m2mtest_queue_setup,
         .buf_prepare     = m2mtest_buf_prepare,
         .buf_queue       = m2mtest_buf_queue,
+        .start_streaming = m2mtest_start_streaming,
+        .stop_streaming  = m2mtest_stop_streaming,
         .wait_prepare    = vb2_ops_wait_prepare,
         .wait_finish     = vb2_ops_wait_finish,
 };
@@ -772,12 +823,12 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
         int ret;
 
         src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-        src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+        src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         src_vq->drv_priv = ctx;
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         src_vq->ops = &m2mtest_qops;
         src_vq->mem_ops = &vb2_vmalloc_memops;
-        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         src_vq->lock = &ctx->dev->dev_mutex;
 
         ret = vb2_queue_init(src_vq);
@@ -785,12 +836,12 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
                 return ret;
 
         dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+        dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         dst_vq->drv_priv = ctx;
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
         dst_vq->ops = &m2mtest_qops;
         dst_vq->mem_ops = &vb2_vmalloc_memops;
-        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+        dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         dst_vq->lock = &ctx->dev->dev_mutex;
 
         return vb2_queue_init(dst_vq);
@@ -801,10 +852,10 @@ static const struct v4l2_ctrl_config m2mtest_ctrl_trans_time_msec = {
         .id = V4L2_CID_TRANS_TIME_MSEC,
         .name = "Transaction Time (msec)",
         .type = V4L2_CTRL_TYPE_INTEGER,
-        .def = 1001,
+        .def = MEM2MEM_DEF_TRANSTIME,
         .min = 1,
         .max = 10001,
-        .step = 100,
+        .step = 1,
 };
 
 static const struct v4l2_ctrl_config m2mtest_ctrl_trans_num_bufs = {