kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/rockchip/isp/common.c
..
..
@@ -6,6 +6,7 @@
6
6
 #include <linux/of_platform.h>
7
7
 #include <linux/slab.h>
8
8
 #include "dev.h"
9
+#include "hw.h"
9
10
 #include "isp_ispp.h"
10
11
 #include "regs.h"
11
12
 
..
..
@@ -36,6 +37,8 @@
36
37
 	*flag = SW_REG_CACHE;
37
38
 	if (dev->hw_dev->is_single || is_direct) {
38
39
 		*flag = SW_REG_CACHE_SYNC;
40
+		if (dev->hw_dev->unite == ISP_UNITE_ONE)
41
+			return;
39
42
 		writel(val, dev->hw_dev->base_next_addr + reg);
40
43
 	}
41
44
 }
..
..
@@ -166,13 +169,16 @@
166
169
 				continue;
167
170
 		}
168
171
 
172
+		if (hw->unite == ISP_UNITE_ONE && dev->unite_index == ISP_UNITE_RIGHT)
173
+			val = dev->sw_base_addr + i + RKISP_ISP_SW_MAX_SIZE;
174
+
169
175
 		if (*flag == SW_REG_CACHE) {
170
176
 			if ((i == ISP3X_MAIN_RESIZE_CTRL ||
171
177
 			     i == ISP32_BP_RESIZE_CTRL ||
172
178
 			     i == ISP3X_SELF_RESIZE_CTRL) && *val == 0)
173
179
 				*val = CIF_RSZ_CTRL_CFG_UPD;
174
180
 			writel(*val, base + i);
175
-			if (hw->is_unite) {
181
+			if (hw->unite == ISP_UNITE_TWO) {
176
182
 				val = dev->sw_base_addr + i + RKISP_ISP_SW_MAX_SIZE;
177
183
 				if ((i == ISP3X_MAIN_RESIZE_CTRL ||
178
184
 				     i == ISP32_BP_RESIZE_CTRL ||