Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14" (a69d4681) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/sm8150-cdp.dtsi

+12 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,18 @@
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_sim_dsc_375_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_sim_dsc_375_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_nt35597_truly_dsc_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

arch/arm64/boot/dts/qcom/sm8150-mtp.dtsi

+12 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,18 @@
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_sim_dsc_375_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_sim_dsc_375_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_nt35597_truly_dsc_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -213,6 +213,9 @@

		&dsi_sw43404_amoled_cmd_display {
		qcom,dsi-display-active;
		};

		&sde_dsi {
		vdd-supply = <&display_panel_avdd_eldo>;
		};

arch/arm64/boot/dts/qcom/sm8150-sde-display.dtsi

+8 −15

Original line number	Diff line number	Diff line
		@@ -580,14 +580,14 @@
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-display-timings {
		timing@0 { /* 1080p */
		qcom,mdss-dsi-panel-phy-timings = [00 12 03 04 07 07 04
		04 03 03 04 00 13 07];
		qcom,mdss-dsi-panel-phy-timings = [00 1A 06 06 22 20 07
		07 04 03 04 00];
		qcom,display-topology = <1 1 1>;
		qcom,default-topology-index = <0>;
		};
		timing@1 { /* qhd */
		qcom,mdss-dsi-panel-phy-timings = [00 12 03 04 07 07 04
		04 03 03 04 00 13 07];
		qcom,mdss-dsi-panel-phy-timings = [00 1A 06 06 22 20 07
		07 04 03 04 00];
		qcom,display-topology = <1 1 1>,
		<2 2 1>, /* dsc merge */
		<2 1 1>; /* 3d mux */
		@@ -601,14 +601,14 @@
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-display-timings {
		timing@0 { /* qhd */
		qcom,mdss-dsi-panel-phy-timings = [00 13 03 03 05 06 03
		03 02 03 04 00 10 06];
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <2 2 2>;
		qcom,default-topology-index = <0>;
		};
		timing@1 { /* 4k */
		qcom,mdss-dsi-panel-phy-timings = [00 13 03 03 05 06 03
		03 02 03 04 00 10 06];
		qcom,mdss-dsi-panel-phy-timings = [00 1e 08 07 24 22 08
		08 05 03 04 00 19 18];
		qcom,display-topology = <2 2 2>;
		qcom,default-topology-index = <0>;
		};
		@@ -618,13 +618,6 @@
		&dsi_sw43404_amoled_cmd {
		qcom,mdss-dsi-t-clk-post = <0x16>;
		qcom,mdss-dsi-t-clk-pre = <0x16>;
		qcom,esd-check-enabled;
		qcom,mdss-dsi-panel-status-check-mode = "reg_read";
		qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a];
		qcom,mdss-dsi-panel-status-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-panel-status-value = <0x9c>;
		qcom,mdss-dsi-panel-on-check-value = <0x9c>;
		qcom,mdss-dsi-panel-status-read-length = <1>;
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings = [00 1a 07 06 22 21 07

drivers/gpu/drm/msm/dsi-staging/dsi_catalog.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl,
		ctrl->ops.error_intr_ctrl = dsi_ctrl_hw_cmn_error_intr_ctrl;
		ctrl->ops.get_error_mask = dsi_ctrl_hw_cmn_get_error_mask;
		ctrl->ops.get_hw_version = dsi_ctrl_hw_cmn_get_hw_version;
		ctrl->ops.wait_for_cmd_mode_mdp_idle =
		dsi_ctrl_hw_cmn_wait_for_cmd_mode_mdp_idle;

		switch (version) {
		case DSI_CTRL_VERSION_1_4: