shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: add code for lsc err

Browse Source 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Idf6649aac80786995b8f5855c464941705698457
This commit is contained in:
Hu Kejun
2020-04-01 18:08:43 +08:00
committed by Tao Huang
parent e03261c79a
commit e7d1916d49
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/rockchip/isp/regs_v2x.h
View File

@@ -1679,6 +1679,7 @@
#define ISP2X_AFM_LUM_OF BIT(13)
#define ISP2X_SIAF_FIN BIT(14)
#define ISP2X_SIHST_RDY BIT(15)
#define ISP2X_LSC_LUT_ERR BIT(16)
#define ISP2X_FLASH_CAP BIT(17)
#define ISP2X_YUVAE_END BIT(18)
#define ISP2X_VSM_END BIT(19)
@@ -1699,6 +1700,7 @@
#define ISP2X_3A_RAWAF_LUM BIT(9)
#define ISP2X_3A_RAWAF BIT(10)
#define ISP2X_3A_RAWAWB BIT(11)
#define ISP2X_3A_DDR_DONE BIT(12)
/* mi interrupt */
#define MI_MP_FRAME BIT(0)

11
drivers/media/platform/rockchip/isp/rkisp.c
View File

@@ -621,6 +621,8 @@ static int rkisp_config_isp(struct rkisp_device *dev)
/* interrupt mask */
irq_mask |= CIF_ISP_FRAME | CIF_ISP_V_START | CIF_ISP_PIC_SIZE_ERROR |
CIF_ISP_FRAME_IN;
if (dev->isp_ver == ISP_V20)
irq_mask |= ISP2X_LSC_LUT_ERR;
writel(irq_mask, base + CIF_ISP_IMSC);
if (dev->isp_ver == ISP_V20 && IS_HDR_RDBK(dev->hdr.op_mode)) {
@@ -2080,6 +2082,15 @@ vs_skip:
}
}
if (isp_mis & ISP2X_LSC_LUT_ERR) {
writel(ISP2X_LSC_LUT_ERR, base + CIF_ISP_ICR);
isp_err = readl(base + CIF_ISP_ERR);
v4l2_err(&dev->v4l2_dev,
"ISP2X_LSC_LUT_ERR. ISP_ERR 0x%x\n", isp_err);
writel(isp_err, base + CIF_ISP_ERR_CLR);
}
/* sampled input frame is complete */
if (isp_mis & CIF_ISP_FRAME_IN) {
writel(CIF_ISP_FRAME_IN, base + CIF_ISP_ICR);