media: rockchip/vpu: Use v4l2_m2m_buf_copy_metadata

Use the recently introduced v4l2_m2m_buf_copy_metadata helper
and get rid of some code.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
index 8bbc905..fbdf709 100644 (file)
--- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
+++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
@@ -58,14 +58,7 @@ static void rockchip_vpu_job_finish(struct rockchip_vpu_dev *vpu,
        src->sequence = ctx->sequence_out++;
        dst->sequence = ctx->sequence_cap++;
 
-       dst->field = src->field;
-       if (src->flags & V4L2_BUF_FLAG_TIMECODE)
-               dst->timecode = src->timecode;
-       dst->vb2_buf.timestamp = src->vb2_buf.timestamp;
-       dst->flags &= ~(V4L2_BUF_FLAG_TSTAMP_SRC_MASK |
-                       V4L2_BUF_FLAG_TIMECODE);
-       dst->flags |= src->flags & (V4L2_BUF_FLAG_TSTAMP_SRC_MASK |
-                                   V4L2_BUF_FLAG_TIMECODE);
+       v4l2_m2m_buf_copy_metadata(src, dst, true);
 
        avail_size = vb2_plane_size(&dst->vb2_buf, 0) -
                     ctx->vpu_dst_fmt->header_size;