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

Commit 3bdcd140 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: handle continuous splash screen for dual DSI cases"

parents e77b6391 9e801407

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+0 −5
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ then 3 options can be tried. 


Optional properties:

- qcom,mdss-dsi-panel-name:		A string used as a descriptive name of the panel

- qcom,cont-splash-enabled:		Boolean used to enable continuous splash mode.

					If this property is specified, it is required to

					to specify the memory reserved for the splash

					screen using the qcom,memblock-reserve binding

					for the framebuffer device attached to the panel.

- qcom,cmd-sync-wait-broadcast:		Boolean used to broadcast dcs command to panels.

- qcom,mdss-dsi-fbc-enable:		Boolean used to enable frame buffer compression mode.

- qcom,mdss-dsi-fbc-slice-height:	Slice height(in lines) of compressed block.

Documentation/devicetree/bindings/fb/mdss-edp.txt

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ Optional properties 




Optional properties:

- qcom,cont-splash-enabled:             Boolean used to enable continuous splash mode.

- qcom,mdss-brightness-max-level:	Specifies the max brightness level supported.

					255 = default value.

Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ Example: 
		qcom,hdmi-tx-ddc-clk = <&msmgpio 32 0>;

		qcom,hdmi-tx-ddc-data = <&msmgpio 33 0>;

		qcom,hdmi-tx-hpd = <&msmgpio 34 0>;

		qcom,cont-splash-enabled;



		qcom,hdmi-tx-mux-lpm = <&msmgpio 27 0>;

		qcom,hdmi-tx-mux-en = <&msmgpio 83 0>;

arch/arm/boot/dts/qcom/msm8952-cdp.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ 
};



&dsi_truly_1080_vid {

	qcom,cont-splash-enabled;

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

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

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
@@ -451,7 +450,6 @@ 
};



&dsi_truly_1080_cmd {

	qcom,cont-splash-enabled;

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};

arch/arm/boot/dts/qcom/msm8952-mtp.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ 
};



&dsi_truly_1080_vid {

	qcom,cont-splash-enabled;

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

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

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
@@ -436,7 +435,6 @@ 
};



&dsi_truly_1080_cmd {

	qcom,cont-splash-enabled;

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};