kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/rockchip/isp/csi.c
..
..
@@ -626,8 +626,7 @@
626
626
 
627
627
 		if (!dev->hw_dev->is_mi_update)
628
628
 			rkisp_unite_write(dev, CSI2RX_CTRL0,
629
-					  SW_IBUF_OP_MODE(dev->hdr.op_mode),
630
-					  true, dev->hw_dev->is_unite);
629
+					  SW_IBUF_OP_MODE(dev->hdr.op_mode), true);
631
630
 
632
631
 		/* hdr merge */
633
632
 		switch (dev->hdr.op_mode) {
..
..
@@ -651,25 +650,22 @@
651
650
 				return -EINVAL;
652
651
 			}
653
652
 		}
654
-		rkisp_unite_write(dev, ISP_HDRMGE_BASE, val, false, dev->hw_dev->is_unite);
653
+		rkisp_unite_write(dev, ISP_HDRMGE_BASE, val, false);
655
654
 
656
655
 		val = RAW_RD_SIZE_ERR;
657
656
 		if (!IS_HDR_RDBK(dev->hdr.op_mode))
658
657
 			val |= ISP21_MIPI_DROP_FRM;
659
-		rkisp_unite_set_bits(dev, CSI2RX_MASK_STAT, 0, val, true, dev->hw_dev->is_unite);
658
+		rkisp_unite_set_bits(dev, CSI2RX_MASK_STAT, 0, val, true);
660
659
 	}
661
660
 
662
661
 	if (IS_HDR_RDBK(dev->hdr.op_mode))
663
-		rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, SW_MPIP_DROP_FRM_DIS,
664
-				     true, dev->hw_dev->is_unite);
662
+		rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, SW_MPIP_DROP_FRM_DIS, true);
665
663
 
666
664
 	if (dev->isp_ver >= ISP_V30)
667
-		rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, ISP3X_SW_ACK_FRM_PRO_DIS,
668
-				     true, dev->hw_dev->is_unite);
665
+		rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, ISP3X_SW_ACK_FRM_PRO_DIS, true);
669
666
 	/* line counter from isp out, default from mp out */
670
667
 	if (dev->isp_ver == ISP_V32_L)
671
-		rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, ISP32L_ISP2ENC_CNT_MUX,
672
-				     true, dev->hw_dev->is_unite);
668
+		rkisp_unite_set_bits(dev, CTRL_SWS_CFG, 0, ISP32L_ISP2ENC_CNT_MUX, true);
673
669
 	dev->rdbk_cnt = -1;
674
670
 	dev->rdbk_cnt_x1 = -1;
675
671
 	dev->rdbk_cnt_x2 = -1;