Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad3da909 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14"

parents 6a56d6a5 3cca7a2f

Documentation/devicetree/bindings/display/msm/dsi.txt

+0 −2
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ Optional properties: 
					turns off PHY pmic power supply, phy ldo and DSI Lane ldo during

					idle screen (footswitch control off) when this property is enabled.

- qcom,dsi-phy-regulator-min-datarate-bps:  Minimum per lane data rate (bps) to turn on PHY regulator.

- qcom,panel-force-clock-lane-hs:	A boolean property indicates that panel needs clock lanes in HS mode only



[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

[2] Documentation/devicetree/bindings/graph.txt
@@ -238,5 +237,4 @@ Example: 
		qcom,dsi-phy-regulator-ldo-mode;

		qcom,panel-allow-phy-poweroff;

		qcom,dsi-phy-regulator-min-datarate-bps = <1200000000>;

		qcom,panel-force-clock-lane-hs;

	};

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+14 −6
Original line number Diff line number Diff line
@@ -164,10 +164,7 @@ Optional properties: 
					"dfps_immediate_porch_mode_vfp" = FPS change request is

					implemented immediately by changing panel vertical

					front porch values.

- qcom,min-refresh-rate:		Minimum refresh rate supported by the panel.

- qcom,max-refresh-rate:		Maximum refresh rate supported by the panel. If max refresh

					rate is not specified, then the frame rate of the panel in

					qcom,mdss-dsi-panel-framerate is used.

- qcom,dsi-supported-dfps-list:		List containing all the supported refresh rates.

- qcom,mdss-dsi-bl-pmic-control-type:	A string that specifies the implementation of backlight

					control for this panel.

					"bl_ctrl_pwm" = Backlight controlled by PWM gpio.
@@ -371,6 +368,9 @@ Optional properties: 
					resolution restrictions.

- qcom,dcs-cmd-by-left:			Boolean to indicate that dcs command are sent

					through the left DSI controller only in a dual-dsi configuration

- qcom,split-link-enabled:		Boolean to indicate split link support in panel.

- qcom,sublinks-count:			Number of sublinks present in a split link enabled configuration.

- qcom,lanes-per-sublink:		Number of lanes present per sublink in a split link enabled configuration.

- qcom,mdss-dsi-panel-hdr-enabled:      Boolean to indicate HDR support in panel.

- qcom,mdss-dsi-panel-hdr-color-primaries:

                                        Array of 8 unsigned integers denoting chromaticity of panel.These
@@ -542,6 +542,10 @@ Optional properties: 
- qcom,mdss-dsi-ext-bridge-mode:	External bridge chip is connected instead of panel.

- qcom,mdss-dsi-dma-schedule-line:	An integer value indicates the line number after vertical active

					region, at which command DMA needs to be triggered.

- qcom,dsi-dyn-clk-enable:		Boolean to indicate dsi dynamic clock switch feature

					is supported.

- qcom,dsi-dyn-clk-list:		An u32 array which lists all the supported dsi bit clock

					frequencies in Hz for the given panel.



Required properties for sub-nodes:	None

Optional properties:
@@ -642,6 +646,9 @@ Example: 
		qcom,mdss-dsi-lane-1-state;

		qcom,mdss-dsi-lane-2-state;

		qcom,mdss-dsi-lane-3-state;

		qcom,split-link-enabled;

		qcom,sublinks-count = <2>;

		qcom,lanes-per-sublink = <2>;

		qcom,mdss-dsi-t-clk-post = <0x20>;

		qcom,mdss-dsi-t-clk-pre = <0x2c>;

		qcom,mdss-dsi-stream = <0>;
@@ -663,8 +670,7 @@ Example: 
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

		qcom,mdss-dsi-pan-enable-dynamic-fps;

		qcom,mdss-dsi-pan-fps-update = "dfps_suspend_resume_mode";

		qcom,min-refresh-rate = <30>;

		qcom,max-refresh-rate = <60>;

		qcom,dsi-supported-dfps-list = <48 55 60>;

		qcom,mdss-dsi-bl-pmic-bank-select = <0>;

		qcom,mdss-dsi-bl-pmic-pwm-frequency = <0>;

		qcom,mdss-dsi-pwm-gpio = <&pm8941_mpps 5 0>;
@@ -801,5 +807,7 @@ Example: 
			                <2 2 1>;

		qcom,default-topology-index = <0>;

		qcom,mdss-dsi-dma-schedule-line = <5>;

		qcom,dsi-dyn-clk-enable;

		qcom,dsi-dyn-clk-list = <798240576 801594528 804948480>;

	};

};

Documentation/devicetree/bindings/drm/msm/sde-dp.txt

+2 −0
Original line number Diff line number Diff line
@@ -100,11 +100,13 @@ Optional properties: 
- compatible:			Must be "qcom,msm-ext-disp"

- qcom,dp-low-power-hw-hpd:	Low power hardware HPD feature enable control node

- qcom,phy-version:		Phy version

- qcom,pn-swap-lane-map:	P/N swap configuration of each lane

- pinctrl-names:		List of names to assign mdss pin states defined in pinctrl device node

				Refer to pinctrl-bindings.txt

- pinctrl-<0..n>:		Lists phandles each pointing to the pin configuration node within a pin

				controller. These pin configurations are installed in the pinctrl

				device node. Refer to pinctrl-bindings.txt

- qcom,max-lclk-frequency-khz:	An integer specifying the max. link clock in KHz supported by Display Port.



[Optional child nodes]: These nodes are for devices which are

dependent on msm_ext_disp. If msm_ext_disp is disabled then

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -62,7 +62,7 @@ 
				qcom,mdss-dsi-h-right-border = <0>;

				qcom,mdss-dsi-v-top-border = <0>;

				qcom,mdss-dsi-v-bottom-border = <0>;

				qcom,mdss-dsi-panel-jitter = <0x4 0x1>;

				qcom,mdss-dsi-panel-jitter = <0x7 0x1>;

				qcom,mdss-dsi-on-command = [

					39 01 00 00 00 00 03 b0 a5 00

					39 01 00 00 00 00 03 5c 42 00

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

+26 −28
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_sw43404_amoled_video>;

	};
@@ -115,7 +115,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_sw43404_amoled_cmd>;

	};
@@ -126,7 +126,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_sw43404_amoled_fhd_plus_cmd>;

	};
@@ -137,7 +137,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_sim_vid>;

	};
@@ -148,7 +148,7 @@ 


		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sim_vid>;

	};
@@ -159,7 +159,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_sim_cmd>;

	};
@@ -170,7 +170,7 @@ 


		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sim_cmd>;

	};
@@ -181,7 +181,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_sim_dsc_375_cmd>;

	};
@@ -192,7 +192,7 @@ 


		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sim_dsc_375_cmd>;

	};
@@ -203,7 +203,7 @@ 


		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sharp_wqhd_video>;

	};
@@ -214,7 +214,7 @@ 


		qcom,dsi-ctrl-num = <0 1>;

		qcom,dsi-phy-num = <0 1>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_dual_sharp_wqhd_cmd>;

	};
@@ -225,7 +225,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_rm69298_truly_amoled_video>;

	};
@@ -236,7 +236,7 @@ 


		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;

		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";



		qcom,dsi-panel = <&dsi_rm69298_truly_amoled_cmd>;

	};
@@ -247,7 +247,7 @@ 


		qcom,dsi-ctrl-num = <1>;

		qcom,dsi-phy-num = <1>;

		qcom,dsi-select-clocks = "src_byte_clk1", "src_pixel_clk1";

		qcom,dsi-select-clocks = "mux_byte_clk1", "mux_pixel_clk1";



		qcom,dsi-panel = <&dsi_nt35695b_truly_fhd_video>;

	};
@@ -258,7 +258,7 @@ 


		qcom,dsi-ctrl-num = <1>;

		qcom,dsi-phy-num = <1>;

		qcom,dsi-select-clocks = "src_byte_clk1", "src_pixel_clk1";

		qcom,dsi-select-clocks = "mux_byte_clk1", "mux_pixel_clk1";



		qcom,dsi-panel = <&dsi_nt35695b_truly_fhd_cmd>;

	};
@@ -269,7 +269,7 @@ 


		qcom,dsi-ctrl-num = <1>;

		qcom,dsi-phy-num = <1>;

		qcom,dsi-select-clocks = "src_byte_clk1", "src_pixel_clk1";

		qcom,dsi-select-clocks = "mux_byte_clk1", "mux_pixel_clk1";



		qcom,dsi-panel = <&dsi_nt35695b_truly_fhd_video>;

	};
@@ -280,7 +280,7 @@ 


		qcom,dsi-ctrl-num = <1>;

		qcom,dsi-phy-num = <1>;

		qcom,dsi-select-clocks = "src_byte_clk1", "src_pixel_clk1";

		qcom,dsi-select-clocks = "mux_byte_clk1", "mux_pixel_clk1";



		qcom,dsi-panel = <&dsi_nt35695b_truly_fhd_cmd>;

	};
@@ -295,8 +295,8 @@ 
			 <&mdss_dsi0_pll PCLK_MUX_0_CLK>,

			 <&mdss_dsi1_pll BYTECLK_MUX_1_CLK>,

			 <&mdss_dsi1_pll PCLK_MUX_1_CLK>;

		clock-names = "src_byte_clk0", "src_pixel_clk0",

				"src_byte_clk1", "src_pixel_clk1";

		clock-names = "mux_byte_clk0", "mux_pixel_clk0",

				"mux_byte_clk1", "mux_pixel_clk1";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_te_active &disp_pins_default>;
@@ -341,8 +341,8 @@ 
			<&mdss_dsi0_pll PCLK_MUX_0_CLK>,

			<&mdss_dsi1_pll BYTECLK_MUX_1_CLK>,

			<&mdss_dsi1_pll PCLK_MUX_1_CLK>;

		clock-names = "src_byte_clk0", "src_pixel_clk0",

			"src_byte_clk1", "src_pixel_clk1";

		clock-names = "mux_byte_clk0", "mux_pixel_clk0",

			"mux_byte_clk1", "mux_pixel_clk1";



		pinctrl-names = "panel_active", "panel_suspend";

		pinctrl-0 = <&sde_te1_active>;
@@ -386,8 +386,7 @@ 
	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-min-refresh-rate = <55>;

	qcom,mdss-dsi-max-refresh-rate = <60>;

	qcom,dsi-supported-dfps-list = <60 57 55>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_hfp";

	qcom,mdss-dsi-display-timings {
@@ -415,6 +414,8 @@ 
		timing@0{

			qcom,mdss-dsi-panel-phy-timings = [00 13 05 04 1F 1E 05

				05 03 02 04 00];



			qcom,mdss-mdp-transfer-time-us = <13000>;

			qcom,display-topology = <2 2 1>;

			qcom,default-topology-index = <0>;

			qcom,partial-update-enabled = "single_roi";
@@ -456,8 +457,7 @@ 
	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-min-refresh-rate = <55>;

	qcom,mdss-dsi-max-refresh-rate = <60>;

	qcom,dsi-supported-dfps-list = <60 57 55>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_hfp";

	qcom,mdss-dsi-display-timings {
@@ -666,9 +666,7 @@ 
	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-min-refresh-rate = <48>;

	qcom,mdss-dsi-max-refresh-rate = <60>;

	qcom,dsi-supported-dfps-list = <60 55 48>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";