From 8d772bd5d55cbbe1cfa75726c611f232e818198f Mon Sep 17 00:00:00 2001 From: Chuanhu Sun Date: Thu, 14 Jul 2022 16:52:36 +0800 Subject: [PATCH] media: rockchip: isp: fix bug the second frame pts is 0 Signed-off-by: Chuanhu Sun Change-Id: Iac44e25668ac96069039208e4376ccb3e7e0a17d --- drivers/media/platform/rockchip/isp/capture.c | 3 +-- drivers/media/platform/rockchip/isp/isp_rockit.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c index b099ee441c2a..84f467343a5f 100644 --- a/drivers/media/platform/rockchip/isp/capture.c +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -1144,7 +1144,6 @@ int rkisp_fh_open(struct file *filp) struct rkisp_stream *stream = video_drvdata(filp); int ret; - stream->is_using_resmem = false; ret = v4l2_fh_open(filp); if (!ret) { ret = v4l2_pipeline_pm_get(&stream->vnode.vdev.entity); @@ -1495,7 +1494,7 @@ int rkisp_get_tb_stream_info(struct rkisp_stream *stream, v4l2_err(&dev->v4l2_dev, "thunderboot no enough memory for image\n"); return -EINVAL; } - stream->is_using_resmem = false; + memcpy(info, &dev->tb_stream_info, sizeof(*info)); return 0; } diff --git a/drivers/media/platform/rockchip/isp/isp_rockit.c b/drivers/media/platform/rockchip/isp/isp_rockit.c index 8cceba1651dc..149fbda73376 100644 --- a/drivers/media/platform/rockchip/isp/isp_rockit.c +++ b/drivers/media/platform/rockchip/isp/isp_rockit.c @@ -385,7 +385,8 @@ int rkisp_rockit_get_tb_stream_info(struct rockit_cfg *input_rockit_cfg, stream = rkisp_rockit_get_stream(input_rockit_cfg); if (!stream) return -EINVAL; - + if (info->buf[0].timestamp) + stream->is_using_resmem = false; return rkisp_get_tb_stream_info(stream, info); } EXPORT_SYMBOL(rkisp_rockit_get_tb_stream_info);