kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
..
..
@@ -31,11 +31,15 @@
31
31
 #define VOP_VERSION_RK3568	VOP2_VERSION(0x40, 0x15, 0x8023)
32
32
 #define VOP_VERSION_RK3588	VOP2_VERSION(0x40, 0x17, 0x6786)
33
33
 
34
+/* register one connector */
34
35
 #define ROCKCHIP_OUTPUT_DUAL_CHANNEL_LEFT_RIGHT_MODE	BIT(0)
36
+/* register one connector */
35
37
 #define ROCKCHIP_OUTPUT_DUAL_CHANNEL_ODD_EVEN_MODE	BIT(1)
36
38
 #define ROCKCHIP_OUTPUT_DATA_SWAP			BIT(2)
37
39
 /* MIPI DSI DataStream(cmd) mode on rk3588 */
38
40
 #define ROCKCHIP_OUTPUT_MIPI_DS_MODE			BIT(3)
41
+/* register two connector */
42
+#define ROCKCHIP_OUTPUT_DUAL_CONNECTOR_SPLIT_MODE	BIT(4)
39
43
 
40
44
 #define AFBDC_FMT_RGB565	0x0
41
45
 #define AFBDC_FMT_U8U8U8U8	0x5
..
..
@@ -595,37 +599,6 @@
595
599
 	RESERVED12 = 12,	/* reserved for other dynamic hdr format */
596
600
 	RESERVED13 = 13,	/* reserved for other dynamic hdr format */
597
601
 	HDR_FORMAT_MAX,
598
-};
599
-
600
-#define ACM_GAIN_LUT_HY_LENGTH		(9*17)
601
-#define ACM_GAIN_LUT_HY_TOTAL_LENGTH	(ACM_GAIN_LUT_HY_LENGTH * 3)
602
-#define ACM_GAIN_LUT_HS_LENGTH		(13*17)
603
-#define ACM_GAIN_LUT_HS_TOTAL_LENGTH (ACM_GAIN_LUT_HS_LENGTH * 3)
604
-#define ACM_DELTA_LUT_H_LENGTH		65
605
-#define ACM_DELTA_LUT_H_TOTAL_LENGTH	(ACM_DELTA_LUT_H_LENGTH * 3)
606
-
607
-struct post_acm {
608
-	s16 delta_lut_h[ACM_DELTA_LUT_H_TOTAL_LENGTH];
609
-	s16 gain_lut_hy[ACM_GAIN_LUT_HY_TOTAL_LENGTH];
610
-	s16 gain_lut_hs[ACM_GAIN_LUT_HS_TOTAL_LENGTH];
611
-	u16 y_gain;
612
-	u16 h_gain;
613
-	u16 s_gain;
614
-	u16 acm_enable;
615
-};
616
-
617
-struct post_csc {
618
-	u16 hue;
619
-	u16 saturation;
620
-	u16 contrast;
621
-	u16 brightness;
622
-	u16 r_gain;
623
-	u16 g_gain;
624
-	u16 b_gain;
625
-	u16 r_offset;
626
-	u16 g_offset;
627
-	u16 b_offset;
628
-	u16 csc_enable;
629
602
 };
630
603
 
631
604
 struct post_csc_coef {
..
..
@@ -1461,7 +1434,9 @@
1461
1434
 #define ROCKCHIP_OUT_MODE_P565		2
1462
1435
 #define ROCKCHIP_OUT_MODE_BT656		5
1463
1436
 #define ROCKCHIP_OUT_MODE_S888		8
1437
+#define ROCKCHIP_OUT_MODE_S666		9
1464
1438
 #define ROCKCHIP_OUT_MODE_YUV422	9
1439
+#define ROCKCHIP_OUT_MODE_S565		10
1465
1440
 #define ROCKCHIP_OUT_MODE_S888_DUMMY	12
1466
1441
 #define ROCKCHIP_OUT_MODE_YUV420	14
1467
1442
 /* for use special outface */