From 8a3d4599c64e578712b4a1d8a953d779868ff9f7 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Mon, 31 Oct 2022 15:23:28 +0800 Subject: [PATCH] media: rockchip: isp: fix dmatx loss first buf Change-Id: I7355529f6ff4f39cba7206b3201d434d110bd4a6 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/capture.c | 2 +- drivers/media/platform/rockchip/isp/rkisp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c index 7bb7a8f6cd67..f186229c807f 100644 --- a/drivers/media/platform/rockchip/isp/capture.c +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -366,7 +366,7 @@ void rkisp_config_dmatx_valid_buf(struct rkisp_device *dev) continue; for (j = RKISP_STREAM_DMATX0; j < RKISP_MAX_STREAM; j++) { stream = &isp->cap_dev.stream[j]; - if (!stream->linked || stream->u.dmatx.is_config) + if (!stream->linked || stream->curr_buf || stream->next_buf) continue; mi_set_y_addr(stream, hw->dummy_buf.dma_addr); } diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c index f3b0948237b1..6afa85ce16b8 100644 --- a/drivers/media/platform/rockchip/isp/rkisp.c +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -2737,7 +2737,7 @@ static void rkisp_global_update_mi(struct rkisp_device *dev) if (stream->id == RKISP_STREAM_VIR || stream->id == RKISP_STREAM_LUMA) continue; - if (stream->streaming) + if (stream->streaming && !stream->next_buf) stream->ops->frame_end(stream); } }