From f8373b4e3e00ce3f6a36942278928044226e136a Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Fri, 21 Aug 2020 18:17:20 +0800 Subject: [PATCH] media: rockchip: isp: adjust hurry priority to middle Change-Id: I3ec12623b3a9529479c181b0cdf4b84e33c9cf2c Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/regs_v2x.h | 6 +++--- drivers/media/platform/rockchip/isp/rkisp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/regs_v2x.h b/drivers/media/platform/rockchip/isp/regs_v2x.h index b0d5e97022f9..f5b333852b4e 100644 --- a/drivers/media/platform/rockchip/isp/regs_v2x.h +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -1772,9 +1772,9 @@ #define SW_LVDS_EAV(a) (((a) & 0xfff) << 16) /* ISP CTRL */ -#define NOC_HURRY_W_HIGH (3 << 30) -#define NOC_HURRY_W_MODE(a) (((a) & 0x3) << 21) -#define NOC_HURRY_R_MODE(a) (((a) & 0x3) << 18) +#define NOC_HURRY_PRIORITY(a) (((a) & 0x3) << 30) +#define NOC_HURRY_W_MODE(a) (((a) & 0x7) << 21) +#define NOC_HURRY_R_MODE(a) (((a) & 0x7) << 18) /* isp interrupt */ #define ISP2X_OFF BIT(0) diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c index 6ef1377beae4..eddc7d8c5c94 100644 --- a/drivers/media/platform/rockchip/isp/rkisp.c +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -1007,7 +1007,7 @@ static int rkisp_isp_start(struct rkisp_device *dev) val |= CIF_ISP_CTRL_ISP_CFG_UPD | CIF_ISP_CTRL_ISP_ENABLE | CIF_ISP_CTRL_ISP_INFORM_ENABLE | CIF_ISP_CTRL_ISP_CFG_UPD_PERMANENT; if (dev->isp_ver == ISP_V20) - val |= NOC_HURRY_W_HIGH | NOC_HURRY_W_MODE(3); + val |= NOC_HURRY_PRIORITY(2) | NOC_HURRY_W_MODE(2) | NOC_HURRY_R_MODE(1); if (atomic_read(&dev->hw_dev->refcnt) > 1) is_direct = false; rkisp_write(dev, CIF_ISP_CTRL, val, is_direct);