Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f60e160e authored by Shaik Ameer Basha's avatar Shaik Ameer Basha Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarJohn Sheu <sheu@google.com>
Signed-off-by: default avatarShaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aecede4c

drivers/media/platform/exynos-gsc/gsc-m2m.c

+13 −7
Original line number Diff line number Diff line
@@ -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;