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

Commit bfda2c1f authored by Jin Li's avatar Jin Li
Browse files

Merge remote-tracking branch 'origin/dev/msm-3.18-drm_kms' into msm-3.18 



* origin/dev/msm-3.18-drm_kms:
  drm/msm: add default value for plane enum property
  drm/msm: Eliminate redundant declare in msm_drv.c
  ARM: dts: msm: disable secondary adv7533 on apq8096proAU ADP
  drm/msm: Increase maximum number of GPU commands
  ARM: dts: msm: enable three displays on 8996 auto platforms

Change-Id: Ic545bbd62515667717144d42e2c3849bf6340c53
Signed-off-by: default avatarJin Li <jinl@codeaurora.org>
parents a747ee15 c251569b

arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts

+4 −3
Original line number Diff line number Diff line
@@ -42,15 +42,16 @@ 


	i2c@75b6000 { /* BLSP8 */

		/* ADV7533 HDMI Bridge Chip removed on ADP Lite */

		adv7533@3d {

			status = "disabled";

		};

		adv7533@39 {

			status = "disabled";

		};

	};

};



&dsi_adv_7533_2 {

	/delete-property/ qcom,dsi-display-active;

};



&pil_modem {

	pinctrl-names = "default";

	pinctrl-0 = <&modem_mux>;

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+52 −8
Original line number Diff line number Diff line
@@ -566,23 +566,38 @@ 
			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@2 {

			qcom,display-type = "primary";

			qcom,plane-name = "dma0", "dma1";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@3 {

			qcom,display-type = "primary";

			qcom,plane-name = "cursor0", "cursor1";

			qcom,plane-type = "cursor";

		};

		qcom,sde-plane-id@4 {

		qcom,sde-plane-id@3 {

			qcom,display-type = "secondary";

			qcom,plane-name = "rgb2", "rgb3";

			qcom,plane-name = "rgb2";

			qcom,plane-type = "primary";

		};

		qcom,sde-plane-id@4 {

			qcom,display-type = "secondary";

			qcom,plane-name = "vig2";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@5 {

			qcom,display-type = "secondary";

			qcom,plane-name = "vig2", "vig3";

			qcom,plane-name = "dma0";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@6 {

			qcom,display-type = "tertiary";

			qcom,plane-name = "rgb3";

			qcom,plane-type = "primary";

		};

		qcom,sde-plane-id@7 {

			qcom,display-type = "tertiary";

			qcom,plane-name = "vig3";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@8 {

			qcom,display-type = "tertiary";

			qcom,plane-name = "dma1";

			qcom,plane-type = "overlay";

		};

	};
@@ -609,6 +624,35 @@ 
&dsi_adv_7533_1 {

	qcom,dsi-display-active;

	qcom,display-type = "secondary";

	qcom,dsi-panel = <&dsi_adv7533_1080p>;



	qcom,panel-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,panel-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdd";

			qcom,supply-min-voltage = <3300000>;

			qcom,supply-max-voltage = <3300000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

		};



		qcom,panel-supply-entry@1 {

			reg = <1>;

			qcom,supply-name = "vddio";

			qcom,supply-min-voltage = <1800000>;

			qcom,supply-max-voltage = <1800000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

		};

	};

};



&dsi_adv_7533_2 {

	qcom,dsi-display-active;

	qcom,dsi-panel = <&dsi_adv7533_1080p>;



	qcom,panel-supply-entries {

		#address-cells = <1>;

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+52 −8
Original line number Diff line number Diff line
@@ -363,23 +363,38 @@ 
			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@2 {

			qcom,display-type = "primary";

			qcom,plane-name = "dma0", "dma1";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@3 {

			qcom,display-type = "primary";

			qcom,plane-name = "cursor0", "cursor1";

			qcom,plane-type = "cursor";

		};

		qcom,sde-plane-id@4 {

		qcom,sde-plane-id@3 {

			qcom,display-type = "secondary";

			qcom,plane-name = "rgb2", "rgb3";

			qcom,plane-name = "rgb2";

			qcom,plane-type = "primary";

		};

		qcom,sde-plane-id@4 {

			qcom,display-type = "secondary";

			qcom,plane-name = "vig2";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@5 {

			qcom,display-type = "secondary";

			qcom,plane-name = "vig2", "vig3";

			qcom,plane-name = "dma0";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@6 {

			qcom,display-type = "tertiary";

			qcom,plane-name = "rgb3";

			qcom,plane-type = "primary";

		};

		qcom,sde-plane-id@7 {

			qcom,display-type = "tertiary";

			qcom,plane-name = "vig3";

			qcom,plane-type = "overlay";

		};

		qcom,sde-plane-id@8 {

			qcom,display-type = "tertiary";

			qcom,plane-name = "dma1";

			qcom,plane-type = "overlay";

		};

	};
@@ -406,6 +421,35 @@ 
&dsi_adv_7533_1 {

	qcom,dsi-display-active;

	qcom,display-type = "secondary";

	qcom,dsi-panel = <&dsi_adv7533_1080p>;



	qcom,panel-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,panel-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdd";

			qcom,supply-min-voltage = <3300000>;

			qcom,supply-max-voltage = <3300000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

		};



		qcom,panel-supply-entry@1 {

			reg = <1>;

			qcom,supply-name = "vddio";

			qcom,supply-min-voltage = <1800000>;

			qcom,supply-max-voltage = <1800000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

		};

	};

};



&dsi_adv_7533_2 {

	qcom,dsi-display-active;

	qcom,dsi-panel = <&dsi_adv7533_1080p>;



	qcom,panel-supply-entries {

		#address-cells = <1>;

arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi

+16 −4
Original line number Diff line number Diff line
@@ -243,14 +243,26 @@ 
				 <&clock_mmss clk_ext_pclk0_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";



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

			pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

			pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



			qcom,dsi-panel = <&dsi_adv7533_720p>;

			vddio-supply = <&pm8994_l14>;

			qcom,bridge-index = <0>;

		};



		dsi_adv_7533_2: qcom,dsi-display@8 {

			compatible = "qcom,dsi-display";

			label = "dsi_adv_7533_2";

			qcom,display-type = "tertiary";



			qcom,dsi-ctrl = <&sde_dsi1>;

			qcom,dsi-phy = <&sde_dsi_phy1>;

			clocks = <&clock_mmss clk_ext_byte1_clk_src>,

				 <&clock_mmss clk_ext_pclk1_clk_src>;

			clock-names = "src_byte_clk", "src_pixel_clk";



			qcom,dsi-panel = <&dsi_adv7533_720p>;

			vddio-supply = <&pm8994_l14>;

			qcom,bridge-index = <1>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ 
	};

};



&dsi_adv_7533_2 {

	/delete-property/ qcom,dsi-display-active;

};



&pil_modem {

	pinctrl-names = "default";

	pinctrl-0 = <&modem_mux>;