From 559e5fb78d347e8eda0832b27fe34050acd586f4 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Tue, 26 Apr 2022 09:01:46 +0800 Subject: [PATCH] Revert "media: rockchip: isp: support soft dvbm for vepu" This reverts commit fa60562f7a004b5613da02e0aca9688b4a2a8614. Change-Id: I7b43ced4870d5b47ebbea828de1773c9aba4190b Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/isp_dvbm.c | 9 --------- drivers/media/platform/rockchip/isp/rkisp.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/isp_dvbm.c b/drivers/media/platform/rockchip/isp/isp_dvbm.c index 6b1aaa77f61e..fe597add1f64 100644 --- a/drivers/media/platform/rockchip/isp/isp_dvbm.c +++ b/drivers/media/platform/rockchip/isp/isp_dvbm.c @@ -82,15 +82,6 @@ int rkisp_dvbm_event(struct rkisp_device *dev, u32 event) case CIF_ISP_V_START: cmd = DVBM_ISP_FRM_START; break; - case ISP3X_OUT_FRM_QUARTER: - cmd = DVBM_ISP_FRM_QUARTER; - break; - case ISP3X_OUT_FRM_HALF: - cmd = DVBM_ISP_FRM_HALF; - break; - case ISP3X_OUT_FRM_END: - cmd = DVBM_ISP_FRM_THREE_QUARTERS; - break; case CIF_MI_MP_FRAME: cmd = DVBM_ISP_FRM_END; break; diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c index c4d1dbc07b0b..149b0b110f1b 100644 --- a/drivers/media/platform/rockchip/isp/rkisp.c +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -1529,15 +1529,6 @@ 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; - if (dev->cap_dev.wrap_line) { - irq_mask |= ISP3X_OUT_FRM_QUARTER | ISP3X_OUT_FRM_HALF | - ISP3X_OUT_FRM_END; - /* line to irq */ - rkisp_write(dev, ISP32_ISP_IRQ_CFG0, - (in_crop->height / 2) << 16 | in_crop->height / 4, false); - rkisp_write(dev, ISP32_ISP_IRQ_CFG1, - in_crop->height / 4 * 3, false); - } if (dev->isp_ver == ISP_V20 || dev->isp_ver == ISP_V21 || dev->isp_ver == ISP_V30 || dev->isp_ver == ISP_V32) irq_mask |= ISP2X_LSC_LUT_ERR;