From ad942c15348f5adc4599eabab73557ecf9ac6fef Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Mon, 16 Dec 2024 09:49:35 +0800 Subject: [PATCH 1/2] media: rockchip: isp: fix isp30 stream buf size if enable attach information Change-Id: I3a061a418cbd87f4bd0dbea6be8ee22ad1429e8a Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/capture_v30.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/rockchip/isp/capture_v30.c b/drivers/media/platform/rockchip/isp/capture_v30.c index ceeed0dfc796..4e35b2e85bcf 100644 --- a/drivers/media/platform/rockchip/isp/capture_v30.c +++ b/drivers/media/platform/rockchip/isp/capture_v30.c @@ -1170,6 +1170,9 @@ static int rkisp_queue_setup(struct vb2_queue *queue, plane_fmt->sizeimage / pixm->height * ALIGN(pixm->height, 16) : plane_fmt->sizeimage; + /* attach information size */ + if (stream->is_attach_info && i == isp_fmt->mplanes - 1) + sizes[i] += sizeof(struct rkisp_frame_info); } rkisp_chk_tb_over(dev); From 31f3e5a5bbdf40aa985c016dbccfc7aa16b3d99f Mon Sep 17 00:00:00 2001 From: Mingwei Yan Date: Mon, 16 Dec 2024 16:27:18 +0800 Subject: [PATCH 2/2] media: rockchip: isp: fix mipi drop when isp capture after vpss start if isp state already START add scale auto update at frame end Signed-off-by: Mingwei Yan Change-Id: I84d63afb87100072a16d69951e635e78c87f9b2c --- drivers/media/platform/rockchip/isp/capture_v39.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/capture_v39.c b/drivers/media/platform/rockchip/isp/capture_v39.c index 993a0bd4dcfd..0242e065c488 100644 --- a/drivers/media/platform/rockchip/isp/capture_v39.c +++ b/drivers/media/platform/rockchip/isp/capture_v39.c @@ -1423,16 +1423,13 @@ static int rkisp_stream_start(struct rkisp_stream *stream) { struct rkisp_device *dev = stream->ispdev; struct v4l2_device *v4l2_dev = &dev->v4l2_dev; - bool async = false; + bool async = (dev->isp_state & ISP_STOP) ? false : true; int ret; stream->need_scl_upd = false; if (stream->id == RKISP_STREAM_LDC) goto skip; - async = (dev->cap_dev.stream[RKISP_STREAM_MP].streaming || - dev->cap_dev.stream[RKISP_STREAM_SP].streaming); - /* * can't be async now, otherwise the latter started stream fails to * produce mi interrupt.