[media] exynos-gsc: propagate timestamps from src to dst buffers

Make gsc-m2m propagate the timestamp field from source to destination
buffers.

Signed-off-by: John Sheu <sheu@google.com>
Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index c267c57c76fdeec23c6fb51c0609929f630c0e91..a8e5050340aae35efc76f0cb965fd3592f2e85a1 100644 (file)
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -99,22 +99,28 @@ static void gsc_m2m_job_abort(void *priv)
                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
 }
 
-static int gsc_fill_addr(struct gsc_ctx *ctx)
+static int gsc_get_bufs(struct gsc_ctx *ctx)
 {
        struct gsc_frame *s_frame, *d_frame;
-       struct vb2_buffer *vb = NULL;
+       struct vb2_buffer *src_vb, *dst_vb;
        int ret;
 
        s_frame = &ctx->s_frame;
        d_frame = &ctx->d_frame;
 
-       vb = v4l2_m2m_next_src_buf(ctx->m2m_ctx);
-       ret = gsc_prepare_addr(ctx, vb, s_frame, &s_frame->addr);
+       src_vb = v4l2_m2m_next_src_buf(ctx->m2m_ctx);
+       ret = gsc_prepare_addr(ctx, src_vb, s_frame, &s_frame->addr);
+       if (ret)
+               return ret;
+
+       dst_vb = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
+       ret = gsc_prepare_addr(ctx, dst_vb, d_frame, &d_frame->addr);
        if (ret)
                return ret;
 
-       vb = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
-       return gsc_prepare_addr(ctx, vb, d_frame, &d_frame->addr);
+       dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+
+       return 0;
 }
 
 static void gsc_m2m_device_run(void *priv)
@@ -148,7 +154,7 @@ static void gsc_m2m_device_run(void *priv)
                goto put_device;
        }
 
-       ret = gsc_fill_addr(ctx);
+       ret = gsc_get_bufs(ctx);
        if (ret) {
                pr_err("Wrong address");
                goto put_device;