kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/rockchip/isp/dev.c
..
..
@@ -239,6 +239,8 @@
239
239
 	data_rate >>= 3;
240
240
 end:
241
241
 	do_div(data_rate, 1000 * 1000);
242
+	if (hw_dev->unite == ISP_UNITE_ONE)
243
+		data_rate *= 4;
242
244
 
243
245
 	/* increase 25% margin */
244
246
 	data_rate += data_rate >> 2;
..
..
@@ -252,7 +254,7 @@
252
254
 
253
255
 	/* set isp clock rate */
254
256
 	rkisp_set_clk_rate(hw_dev->clks[0], hw_dev->clk_rate_tbl[i].clk_rate * 1000000UL);
255
-	if (hw_dev->is_unite)
257
+	if (hw_dev->unite == ISP_UNITE_TWO)
256
258
 		rkisp_set_clk_rate(hw_dev->clks[5], hw_dev->clk_rate_tbl[i].clk_rate * 1000000UL);
257
259
 	/* aclk equal to core clk */
258
260
 	if (dev->isp_ver == ISP_V32)
..
..
@@ -842,7 +844,7 @@
842
844
 	if (ret)
843
845
 		return ret;
844
846
 
845
-	if (isp_dev->hw_dev->is_unite)
847
+	if (isp_dev->hw_dev->unite)
846
848
 		mult = 2;
847
849
 	isp_dev->sw_base_addr = devm_kzalloc(dev, RKISP_ISP_SW_MAX_SIZE * mult, GFP_KERNEL);
848
850
 	if (!isp_dev->sw_base_addr)
..
..
@@ -854,7 +856,7 @@
854
856
 
855
857
 	snprintf(isp_dev->media_dev.model, sizeof(isp_dev->media_dev.model),
856
858
 		 "%s%d", DRIVER_NAME, isp_dev->dev_id);
857
-	if (!isp_dev->hw_dev->is_unite)
859
+	if (!isp_dev->hw_dev->unite)
858
860
 		strscpy(isp_dev->name, dev_name(dev), sizeof(isp_dev->name));
859
861
 	else
860
862
 		snprintf(isp_dev->name, sizeof(isp_dev->name),
..
..
@@ -978,6 +980,13 @@
978
980
 	    rkisp_update_sensor_info(isp_dev) >= 0)
979
981
 		_set_pipeline_default_fmt(isp_dev, false);
980
982
 
983
+	if (isp_dev->hw_dev->is_assigned_clk)
984
+		rkisp_clk_dbg = true;
985
+
986
+	if (isp_dev->hw_dev->unite == ISP_UNITE_ONE &&
987
+	    !(isp_dev->isp_inp & INP_RAWRD2))
988
+		rkisp_rdbk_auto = true;
989
+
981
990
 	isp_dev->cap_dev.wait_line = rkisp_wait_line;
982
991
 	isp_dev->cap_dev.wrap_line = rkisp_wrap_line;
983
992
 	isp_dev->is_rdbk_auto = rkisp_rdbk_auto;