summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/m2m-deinterlace.c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-02-08 18:21:35 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-05 20:47:15 +0100
commit309f4d62eda0e864c2d4eef536cc82e41931c3c5 (patch)
treed5750f1dce1f46da1c35935cc02d344c3d4b4899 /drivers/media/platform/m2m-deinterlace.c
parent[media] exynos-gsc, m2m-deinterlace, mx2_emmaprp: Copy v4l2_buffer data from ... (diff)
downloadlinux-309f4d62eda0e864c2d4eef536cc82e41931c3c5.tar.xz
linux-309f4d62eda0e864c2d4eef536cc82e41931c3c5.zip
[media] v4l: Copy timestamp source flags to destination on m2m devices
Copy the flags containing the timestamp source from source buffer flags to the destination buffer flags on memory-to-memory devices. This is analogous to copying the timestamp field from source to destination. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/m2m-deinterlace.c')
-rw-r--r--drivers/media/platform/m2m-deinterlace.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 34161314ea0f..c21d14fd61db 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -208,6 +208,9 @@ static void dma_callback(void *data)
dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+ dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+ dst_vb->v4l2_buf.flags |=
+ src_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);