kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/rockchip/cif/Kconfig
..
..
@@ -4,10 +4,9 @@
4
4
 	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
5
5
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
6
6
 	depends on MEDIA_CAMERA_SUPPORT
7
-	select VIDEOBUF2_DMA_CONTIG
8
-	select VIDEOBUF2_DMA_SG
7
+	select VIDEOBUF2_CMA_SG
8
+	select VIDEOBUF2_VMALLOC
9
9
 	select V4L2_FWNODE
10
-	select PHY_ROCKCHIP_MIPI_RX
11
10
 	default n
12
11
 	help
13
12
 	  Support for CIF on the rockchip SoCs like rk312x, rk3288.
..
..
@@ -38,3 +37,42 @@
38
37
 
39
38
 endchoice
40
39
 
40
+config ROCKCHIP_CIF_USE_MONITOR
41
+	bool "rkcif use monitor"
42
+	depends on VIDEO_ROCKCHIP_CIF
43
+	default n
44
+	help
45
+	  Support for CIF to monitor capture error.
46
+
47
+config ROCKCHIP_CIF_MONITOR_MODE
48
+	hex "rkcif monitor mode"
49
+	default 0x1
50
+	depends on ROCKCHIP_CIF_USE_MONITOR
51
+
52
+config ROCKCHIP_CIF_MONITOR_START_FRAME
53
+	hex "the frame id to start monitor"
54
+	default 0
55
+	depends on ROCKCHIP_CIF_USE_MONITOR
56
+
57
+config ROCKCHIP_CIF_MONITOR_CYCLE
58
+	hex "frame num of monitoring cycle"
59
+	default 0x8
60
+	depends on ROCKCHIP_CIF_USE_MONITOR
61
+
62
+config ROCKCHIP_CIF_MONITOR_KEEP_TIME
63
+	hex "timeout for keep monitoring after finding out error, unit(ms)"
64
+	default 0x3e8
65
+	depends on ROCKCHIP_CIF_USE_MONITOR
66
+
67
+config ROCKCHIP_CIF_MONITOR_ERR_CNT
68
+	hex "error reference val for resetting"
69
+	default 0x5
70
+	depends on ROCKCHIP_CIF_USE_MONITOR
71
+
72
+config ROCKCHIP_CIF_RESET_BY_USER
73
+	bool "rkcif reset by user"
74
+	depends on ROCKCHIP_CIF_USE_MONITOR
75
+	default n
76
+	help
77
+	  Support for CIF to reset pipe by user.
78
+