From c548ab23b435af02ce1c748c82297cffc4bef09e Mon Sep 17 00:00:00 2001 From: Kamil Debski Date: Thu, 25 Apr 2013 07:21:24 -0300 Subject: [PATCH] --- yaml --- r: 367111 b: refs/heads/master c: a8c9c345702b3f52a88498dea6b623dd3c3e27dc h: refs/heads/master i: 367109: f89d5320a15c977fd24f4a487405f560f5291891 367107: 47a242ebfbfba021e787fd56dee873aa35bc400b 367103: ca901e4e507b99b6af1134d449bb4015924a1efb v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/mx2_emmaprp.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 59d85b7cdb57..7d7035199017 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f1e8f197e2fdc97ef51e6aa31ba3d207e6ef076 +refs/heads/master: a8c9c345702b3f52a88498dea6b623dd3c3e27dc diff --git a/trunk/drivers/media/platform/mx2_emmaprp.c b/trunk/drivers/media/platform/mx2_emmaprp.c index 4b9e0a28616a..f7440e585b6b 100644 --- a/trunk/drivers/media/platform/mx2_emmaprp.c +++ b/trunk/drivers/media/platform/mx2_emmaprp.c @@ -377,6 +377,9 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data) src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx); + src_vb->v4l2_buf.timestamp = dst_vb->v4l2_buf.timestamp; + src_vb->v4l2_buf.timecode = dst_vb->v4l2_buf.timecode; + spin_lock_irqsave(&pcdev->irqlock, flags); v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE); @@ -763,6 +766,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); src_vq->ops = &emmaprp_qops; src_vq->mem_ops = &vb2_dma_contig_memops; + src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY; ret = vb2_queue_init(src_vq); if (ret) @@ -774,6 +778,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); dst_vq->ops = &emmaprp_qops; dst_vq->mem_ops = &vb2_dma_contig_memops; + dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY; return vb2_queue_init(dst_vq); }