add boot partition size

hc

2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d

 kernel/drivers/gpu/drm/bridge/lontium-lt9611.c
..
..
@@ -11,13 +11,14 @@
11
11
 #include <linux/platform_device.h>
12
12
 #include <linux/regmap.h>
13
13
 #include <linux/regulator/consumer.h>
14
-#include <drm/drm_crtc_helper.h>
14
+
15
15
 #include <sound/hdmi-codec.h>
16
16
 
17
17
 #include <drm/drm_atomic_helper.h>
18
18
 #include <drm/drm_bridge.h>
19
19
 #include <drm/drm_mipi_dsi.h>
20
20
 #include <drm/drm_print.h>
21
+#include <drm/drm_probe_helper.h>
21
22
 
22
23
 #define EDID_SEG_SIZE	256
23
24
 #define EDID_LEN	32
..
..
@@ -46,6 +47,7 @@
46
47
 	struct gpio_desc *enable_gpio;
47
48
 
48
49
 	bool power_on;
50
+	bool sleep;
49
51
 
50
52
 	struct regulator_bulk_data supplies[2];
51
53
 
..
..
@@ -93,8 +95,6 @@
93
95
 	{ 1920, 1080, 60, 4, 1 }, /* 1080P 24bit 60Hz 4lane 1port */
94
96
 	{ 1920, 1080, 30, 3, 1 }, /* 1080P 24bit 30Hz 3lane 1port */
95
97
 	{ 1920, 1080, 24, 3, 1 },
96
-	{ 1280, 720, 60, 4, 1 },
97
-	{ 1280, 720, 30, 4, 1 },
98
98
 	{ 720, 480, 60, 4, 1 },
99
99
 	{ 720, 576, 50, 2, 1 },
100
100
 	{ 640, 480, 60, 2, 1 },
..
..
@@ -230,14 +230,8 @@
230
230
 	case 640:
231
231
 		regmap_write(lt9611->regmap, 0x8326, 0x14);
232
232
 		break;
233
-	case 1280:
234
-		regmap_write(lt9611->regmap, 0x8326, 0x1c);
235
-		break;
236
233
 	case 1920:
237
-		if (drm_mode_vrefresh(mode) == 30)
238
-			regmap_write(lt9611->regmap, 0x8326, 0x1c);
239
-		else
240
-			regmap_write(lt9611->regmap, 0x8326, 0x37);
234
+		regmap_write(lt9611->regmap, 0x8326, 0x37);
241
235
 		break;
242
236
 	case 3840:
243
237
 		regmap_multi_reg_write(lt9611->regmap, reg_cfg2, ARRAY_SIZE(reg_cfg2));
..
..
@@ -443,6 +437,26 @@
443
437
 	regmap_write(lt9611->regmap, 0x8203, val);
444
438
 	regmap_write(lt9611->regmap, 0x8207, 0xff); /* clear */
445
439
 	regmap_write(lt9611->regmap, 0x8207, 0x3f);
440
+}
441
+
442
+static void lt9611_sleep_setup(struct lt9611 *lt9611)
443
+{
444
+	const struct reg_sequence sleep_setup[] = {
445
+		{ 0x8024, 0x76 },
446
+		{ 0x8023, 0x01 },
447
+		{ 0x8157, 0x03 }, /* set addr pin as output */
448
+		{ 0x8149, 0x0b },
449
+		{ 0x8151, 0x30 }, /* disable IRQ */
450
+		{ 0x8102, 0x48 }, /* MIPI Rx power down */
451
+		{ 0x8123, 0x80 },
452
+		{ 0x8130, 0x00 },
453
+		{ 0x8100, 0x01 }, /* bandgap power down */
454
+		{ 0x8101, 0x00 }, /* system clk power down */
455
+	};
456
+
457
+	regmap_multi_reg_write(lt9611->regmap,
458
+			       sleep_setup, ARRAY_SIZE(sleep_setup));
459
+	lt9611->sleep = true;
446
460
 }
447
461
 
448
462
 static int lt9611_power_on(struct lt9611 *lt9611)
..
..
@@ -762,7 +776,8 @@
762
776
 
763
777
 	dsi->lanes = 4;
764
778
 	dsi->format = MIPI_DSI_FMT_RGB888;
765
-	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST;
779
+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
780
+			  MIPI_DSI_MODE_VIDEO_HSE;
766
781
 
767
782
 	ret = mipi_dsi_attach(dsi);
768
783
 	if (ret < 0) {
..
..
@@ -801,20 +816,28 @@
801
816
 
802
817
 	drm_connector_helper_add(&lt9611->connector,
803
818
 				 &lt9611_bridge_connector_helper_funcs);
804
-	drm_connector_attach_encoder(&lt9611->connector, bridge->encoder);
805
819
 
806
820
 	if (!bridge->encoder) {
807
821
 		DRM_ERROR("Parent encoder object not found");
808
822
 		return -ENODEV;
809
823
 	}
810
824
 
825
+	drm_connector_attach_encoder(&lt9611->connector, bridge->encoder);
826
+
811
827
 	return 0;
812
828
 }
813
829
 
814
-static int lt9611_bridge_attach(struct drm_bridge *bridge)
830
+static int lt9611_bridge_attach(struct drm_bridge *bridge,
831
+				enum drm_bridge_attach_flags flags)
815
832
 {
816
833
 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
817
834
 	int ret;
835
+
836
+	if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) {
837
+		ret = lt9611_connector_init(bridge, lt9611);
838
+		if (ret < 0)
839
+			return ret;
840
+	}
818
841
 
819
842
 	/* Attach primary DSI */
820
843
 	lt9611->dsi0 = lt9611_attach_dsi(lt9611, lt9611->dsi0_node);
..
..
@@ -830,9 +853,7 @@
830
853
 		}
831
854
 	}
832
855
 
833
-	ret = lt9611_connector_init(bridge, lt9611);
834
-
835
-	return ret;
856
+	return 0;
836
857
 
837
858
 err_unregister_dsi0:
838
859
 	lt9611_bridge_detach(bridge);
..
..
@@ -843,30 +864,43 @@
843
864
 }
844
865
 
845
866
 static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge,
867
+						     const struct drm_display_info *info,
846
868
 						     const struct drm_display_mode *mode)
847
869
 {
848
870
 	struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode);
871
+	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
849
872
 
850
-	return lt9611_mode ? MODE_OK : MODE_BAD;
873
+	if (!lt9611_mode)
874
+		return MODE_BAD;
875
+	else if (lt9611_mode->intfs > 1 && !lt9611->dsi1)
876
+		return MODE_PANEL;
877
+	else
878
+		return MODE_OK;
851
879
 }
852
880
 
853
881
 static void lt9611_bridge_pre_enable(struct drm_bridge *bridge)
854
882
 {
855
883
 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
856
884
 
885
+	if (!lt9611->sleep)
886
+		return;
887
+
857
888
 	lt9611_reset(lt9611);
858
889
 	regmap_write(lt9611->regmap, 0x80ee, 0x01);
859
-	lt9611_enable_hpd_interrupts(lt9611);
860
890
 
891
+	lt9611->sleep = false;
861
892
 }
862
893
 
863
894
 static void lt9611_bridge_post_disable(struct drm_bridge *bridge)
864
895
 {
896
+	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
897
+
898
+	lt9611_sleep_setup(lt9611);
865
899
 }
866
900
 
867
901
 static void lt9611_bridge_mode_set(struct drm_bridge *bridge,
868
-				   struct drm_display_mode *mode,
869
-				   struct drm_display_mode *adj_mode)
902
+				   const struct drm_display_mode *mode,
903
+				   const struct drm_display_mode *adj_mode)
870
904
 {
871
905
 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
872
906
 	struct hdmi_avi_infoframe avi_frame;
..
..
@@ -879,9 +913,42 @@
879
913
 	lt9611_mipi_video_setup(lt9611, mode);
880
914
 	lt9611_pcr_setup(lt9611, mode);
881
915
 
882
-	ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame, mode, false);
916
+	ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame,
917
+						       &lt9611->connector,
918
+						       mode);
883
919
 	if (!ret)
884
920
 		lt9611->vic = avi_frame.video_code;
921
+}
922
+
923
+static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)
924
+{
925
+	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
926
+	unsigned int reg_val = 0;
927
+	int connected;
928
+
929
+	regmap_read(lt9611->regmap, 0x825e, &reg_val);
930
+	connected  = reg_val & BIT(2);
931
+
932
+	lt9611->status = connected ?  connector_status_connected :
933
+				connector_status_disconnected;
934
+
935
+	return lt9611->status;
936
+}
937
+
938
+static struct edid *lt9611_bridge_get_edid(struct drm_bridge *bridge,
939
+					   struct drm_connector *connector)
940
+{
941
+	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
942
+
943
+	lt9611_power_on(lt9611);
944
+	return drm_do_get_edid(connector, lt9611_get_edid_block, lt9611);
945
+}
946
+
947
+static void lt9611_bridge_hpd_enable(struct drm_bridge *bridge)
948
+{
949
+	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
950
+
951
+	lt9611_enable_hpd_interrupts(lt9611);
885
952
 }
886
953
 
887
954
 static const struct drm_bridge_funcs lt9611_bridge_funcs = {
..
..
@@ -892,6 +959,9 @@
892
959
 	.disable = lt9611_bridge_disable,
893
960
 	.post_disable = lt9611_bridge_post_disable,
894
961
 	.mode_set = lt9611_bridge_mode_set,
962
+	.detect = lt9611_bridge_detect,
963
+	.get_edid = lt9611_bridge_get_edid,
964
+	.hpd_enable = lt9611_bridge_hpd_enable,
895
965
 };
896
966
 
897
967
 static int lt9611_parse_dt(struct device *dev,
..
..
@@ -1058,6 +1128,7 @@
1058
1128
 
1059
1129
 	lt9611->dev = &client->dev;
1060
1130
 	lt9611->client = client;
1131
+	lt9611->sleep = false;
1061
1132
 
1062
1133
 	lt9611->regmap = devm_regmap_init_i2c(client, &lt9611_regmap_config);
1063
1134
 	if (IS_ERR(lt9611->regmap)) {
..
..
@@ -1095,8 +1166,7 @@
1095
1166
 
1096
1167
 	ret = devm_request_threaded_irq(dev, client->irq, NULL,
1097
1168
 					lt9611_irq_thread_handler,
1098
-					IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
1099
-					"lt9611", lt9611);
1169
+					IRQF_ONESHOT, "lt9611", lt9611);
1100
1170
 	if (ret) {
1101
1171
 		dev_err(dev, "failed to request irq\n");
1102
1172
 		goto err_disable_regulators;
..
..
@@ -1106,6 +1176,9 @@
1106
1176
 
1107
1177
 	lt9611->bridge.funcs = &lt9611_bridge_funcs;
1108
1178
 	lt9611->bridge.of_node = client->dev.of_node;
1179
+	lt9611->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID |
1180
+			     DRM_BRIDGE_OP_HPD | DRM_BRIDGE_OP_MODES;
1181
+	lt9611->bridge.type = DRM_MODE_CONNECTOR_HDMIA;
1109
1182
 
1110
1183
 	drm_bridge_add(&lt9611->bridge);
1111
1184