diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c
index 483f61c2bbfc..9fbc12713032 100644
--- a/drivers/media/platform/rockchip/isp/capture.c
+++ b/drivers/media/platform/rockchip/isp/capture.c
@@ -3300,9 +3300,9 @@ void rkisp_mipi_v20_isr(unsigned int phy, unsigned int packet,
 
 	v4l2_dbg(3, rkisp_debug, &dev->v4l2_dev,
 		 "csi state:0x%x\n", state);
-	if (phy)
+	if (phy && (dev->isp_inp & INP_CSI))
 		v4l2_warn(v4l2_dev, "MIPI error: phy: 0x%08x\n", phy);
-	if (packet)
+	if (packet && (dev->isp_inp & INP_CSI))
 		v4l2_warn(v4l2_dev, "MIPI error: packet: 0x%08x\n", packet);
 	if (overflow)
 		v4l2_warn(v4l2_dev, "MIPI error: overflow: 0x%08x\n", overflow);
diff --git a/drivers/media/platform/rockchip/isp/csi.c b/drivers/media/platform/rockchip/isp/csi.c
index b1154021a7cf..c2cc8aaa289c 100644
--- a/drivers/media/platform/rockchip/isp/csi.c
+++ b/drivers/media/platform/rockchip/isp/csi.c
@@ -410,6 +410,8 @@ int rkisp_csi_config_patch(struct rkisp_device *dev)
 		writel(val, dev->base_addr + ISP_HDRMGE_BASE);
 		writel(val & SW_HDRMGE_EN, dev->base_addr + ISP_HDRTMO_BASE);
 		writel(0x7FFFFF7F, dev->base_addr + CSI2RX_MASK_STAT);
+		writel(0, dev->base_addr + CSI2RX_MASK_PACKET);
+		writel(0, dev->base_addr + CSI2RX_MASK_PHY);
 	}
 
 	if (IS_HDR_RDBK(dev->hdr.op_mode))