update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/rockchip/isp/common.c
..
..
@@ -169,8 +169,10 @@
169
169
 				continue;
170
170
 		}
171
171
 
172
-		if (hw->unite == ISP_UNITE_ONE && dev->unite_index == ISP_UNITE_RIGHT)
172
+		if (hw->unite == ISP_UNITE_ONE && dev->unite_index == ISP_UNITE_RIGHT) {
173
173
 			val = dev->sw_base_addr + i + RKISP_ISP_SW_MAX_SIZE;
174
+			flag = dev->sw_base_addr + i + RKISP_ISP_SW_MAX_SIZE + RKISP_ISP_SW_REG_SIZE;
175
+		}
174
176
 
175
177
 		if (*flag == SW_REG_CACHE) {
176
178
 			if ((i == ISP3X_MAIN_RESIZE_CTRL ||
..
..
@@ -316,6 +318,11 @@
316
318
 		return -EINVAL;
317
319
 	}
318
320
 
321
+	if (hw->dev_num >= DEV_MAX) {
322
+		dev_err(isp->dev, "failed attach isp hw, max dev:%d\n", DEV_MAX);
323
+		return -EINVAL;
324
+	}
325
+
319
326
 	isp->dev_id = hw->dev_num;
320
327
 	hw->isp[hw->dev_num] = isp;
321
328
 	hw->dev_num++;
..
..
@@ -449,3 +456,14 @@
449
456
 	else
450
457
 		rkisp_free_buffer(dev, &hw->dummy_buf);
451
458
 }
459
+
460
+u64 rkisp_time_get_ns(struct rkisp_device *dev)
461
+{
462
+	u64 ns;
463
+
464
+	if (dev->isp_ver == ISP_V32)
465
+		ns = ktime_get_boottime_ns();
466
+	else
467
+		ns = ktime_get_ns();
468
+	return ns;
469
+}