]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] s5p-g2d: Add copy time stamp handling
authorKamil Debski <k.debski@samsung.com>
Wed, 24 Apr 2013 12:34:03 +0000 (09:34 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 25 Apr 2013 12:47:07 +0000 (09:47 -0300)
Since the introduction of the timestamp_type field, it is necessary that
the driver chooses which type it will use. This patch adds support for
the timestamp_type.

Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/s5p-g2d/g2d.c

index 14d663dacdbd21b8ad8c87d74c4bcc7d1bf12ace..553d87e5ceab41b9d2d081c6fc55dbe4b17db1ed 100644 (file)
@@ -158,6 +158,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
        src_vq->ops = &g2d_qops;
        src_vq->mem_ops = &vb2_dma_contig_memops;
        src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+       src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
        ret = vb2_queue_init(src_vq);
        if (ret)
@@ -169,6 +170,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
        dst_vq->ops = &g2d_qops;
        dst_vq->mem_ops = &vb2_dma_contig_memops;
        dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+       dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
 
        return vb2_queue_init(dst_vq);
 }
@@ -635,6 +637,9 @@ static irqreturn_t g2d_isr(int irq, void *prv)
        BUG_ON(src == NULL);
        BUG_ON(dst == NULL);
 
+       dst->v4l2_buf.timecode = src->v4l2_buf.timecode;
+       dst->v4l2_buf.timestamp = src->v4l2_buf.timestamp;
+
        v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE);
        v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE);
        v4l2_m2m_job_finish(dev->m2m_dev, ctx->m2m_ctx);