From f28d124bf7f21f0196ed69d6dafba7e12390165a Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Wed, 10 Jun 2020 10:25:32 +0800 Subject: [PATCH] media: rockchip: isp: high write hurry priority Change-Id: I2e2af49812efb30ad997b4809f0fd5dbb910f990 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/regs_v2x.h | 5 +++++ drivers/media/platform/rockchip/isp/rkisp.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/media/platform/rockchip/isp/regs_v2x.h b/drivers/media/platform/rockchip/isp/regs_v2x.h index b82d081a5004..c5c49a5a460b 100644 --- a/drivers/media/platform/rockchip/isp/regs_v2x.h +++ b/drivers/media/platform/rockchip/isp/regs_v2x.h @@ -1768,6 +1768,11 @@ #define SW_LVDS_SAV(a) ((a) & 0xfff) #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) + /* isp interrupt */ #define ISP2X_OFF BIT(0) #define ISP2X_FRAME BIT(1) diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c index c868e2222741..d4d0a28bd18c 100644 --- a/drivers/media/platform/rockchip/isp/rkisp.c +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -1024,6 +1024,8 @@ static int rkisp_isp_start(struct rkisp_device *dev) val = readl(base + CIF_ISP_CTRL); 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); writel(val, base + CIF_ISP_CTRL); dev->isp_err_cnt = 0;