From 658587bd614cf34cfcca136a7dcaab9c8f256080 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Thu, 18 Mar 2021 09:48:44 +0800 Subject: [PATCH] media: rockchip: ispp: check SHARP_CORE_CTRL after update Change-Id: Iad0d7b2c1e9a0f1222d5055656b598ce542b6d54 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/ispp/stream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c index 6d2b534ef0e2..fbecd4360818 100644 --- a/drivers/media/platform/rockchip/ispp/stream.c +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -2600,14 +2600,15 @@ static void nr_work_event(struct rkispp_device *dev, } rkispp_update_regs(dev, RKISPP_NR, RKISPP_ORB_MAX_FEATURE); } + + writel(OTHER_FORCE_UPD, base + RKISPP_CTRL_UPDATE); + val = readl(base + RKISPP_SHARP_CORE_CTRL); if (!(val & SW_SHP_EN) && !is_fec_en && !stream->streaming) writel(val | SW_SHP_DMA_DIS, base + RKISPP_SHARP_CORE_CTRL); else if (val & SW_SHP_EN) writel(val & ~SW_SHP_DMA_DIS, base + RKISPP_SHARP_CORE_CTRL); - writel(OTHER_FORCE_UPD, base + RKISPP_CTRL_UPDATE); - v4l2_dbg(3, rkispp_debug, &dev->v4l2_dev, "NR start seq:%d | Y_SHD rd:0x%x wr:0x%x\n", seq, readl(base + RKISPP_NR_ADDR_BASE_Y_SHD),