From 1ccd80fbcc08dbc7315b76b73638104a9c3b9292 Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Mon, 20 Apr 2020 15:33:06 +0800 Subject: [PATCH] media: rockchip: ispp: fix to use new nr algorithm Signed-off-by: Hu Kejun Change-Id: Ib43c76b24cd4b963aabfcdac1cea19d518a5f621 --- drivers/media/platform/rockchip/ispp/regs.h | 2 ++ drivers/media/platform/rockchip/ispp/stream.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/media/platform/rockchip/ispp/regs.h b/drivers/media/platform/rockchip/ispp/regs.h index d40f94034ae5..ef88c0a1bab8 100644 --- a/drivers/media/platform/rockchip/ispp/regs.h +++ b/drivers/media/platform/rockchip/ispp/regs.h @@ -323,6 +323,8 @@ #define FMT_YUV422 BIT(1) #define FMT_FBC BIT(0) +#define NR_NEW_ALGO BIT(16) + /* ISPP_STRT */ #define FEC_ST BIT(2) #define NR_SHP_ST BIT(1) diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c index 38d2d7a2117f..899ecd958bee 100644 --- a/drivers/media/platform/rockchip/ispp/stream.c +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -640,6 +640,8 @@ static int config_nr_shp(struct rkispp_device *dev) goto err; writel(buf->dma_addr, base + RKISPP_SHARP_TMP_YUV_BASE); + /* fix to use new nr algorithm */ + rkispp_set_bits(base + RKISPP_NR_CTRL, NR_NEW_ALGO, NR_NEW_ALGO); rkispp_set_bits(base + RKISPP_NR_CTRL, FMT_RD_MASK, fmt); if (fmt & FMT_FBC) { writel(0, base + RKISPP_NR_VIR_STRIDE);