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

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

Merge "ARM: dts: msm: Disable shared display on DP display sa8155"

parents 72eb4246 a4336bf9

arch/arm64/boot/dts/qcom/sa6155-display.dtsi

+3 −64
Original line number Diff line number Diff line
@@ -295,59 +295,6 @@ 
		 };

	 };



	sde_sh_base1: qcom,shared-display-base@1 {

		      qcom,shared-display-base-intf = <0>;

		      qcom,shared-display-base-mode {

			      qcom,mode-h-active = <1920>;

			      qcom,mode-h-front-porch = <88>;

			      qcom,mode-h-pulse-width = <44>;

			      qcom,mode-h-back-porch = <148>;

			      qcom,mode-h-active-high;

			      qcom,mode-v-active = <1080>;

			      qcom,mode-v-front-porch = <4>;

			      qcom,mode-v-pulse-width = <5>;

			      qcom,mode-v-back-porch = <36>;

			      qcom,mode-v-active-high;

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

			      qcom,mode-clock-in-khz = <148500>;

		      };

	      };





	sde_sh3: qcom,shared-display@3 {

		 compatible = "qcom,shared-display";

		 qcom,shared-display-base = <&sde_sh_base1>;

		 qcom,blend-stage-range = <0 7>;

		 qcom,shared-display-name = "shared-disp-3";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;

			 qcom,mode-v-active = <1080>;

		 };

		 qcom,shared-display-dst-mode {

			 qcom,mode-x-offset = <0>;

			 qcom,mode-y-offset = <0>;

			 qcom,mode-width = <1920>;

			 qcom,mode-height = <1080>;

		 };

	 };



	sde_sh4: qcom,shared-display@4 {

		 compatible = "qcom,shared-display";

		 qcom,shared-display-base = <&sde_sh_base1>;

		 qcom,blend-stage-range = <7 1>;

		 qcom,shared-display-name = "shared-disp-4";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;

			 qcom,mode-v-active = <1080>;

		 };

		 qcom,shared-display-dst-mode {

			 qcom,mode-x-offset = <0>;

			 qcom,mode-y-offset = <0>;

			 qcom,mode-width = <1920>;

			 qcom,mode-height = <1080>;

		 };

	 };



	 qcom,sde-shared-plane {

		 compatible = "qcom,sde-shared-plane";

		 qcom,add-planes {
@@ -364,21 +311,13 @@ 
				 qcom,plane-init-handoff;

				 qcom,plane-seamless-mode = "shared";

			 };

			 plane@2 {

				 qcom,plane-name = "plane-2-splash";

				 qcom,plane-parent = "plane-2";

				 qcom,plane-init-active;

				 qcom,plane-init-handoff;

				 qcom,plane-seamless-mode = "shared";

			 };



		 };

	 };



	sde_card1: qcom,sde-kms-lease@0 {

		   compatible = "qcom,sde-kms-lease";

		   qcom,dev-name = "msm_drm";

		   qcom,lease-connectors = "DSI-2","DP-4","DP-2","DP-3";

		   qcom,lease-connectors = "DSI-2","DP-1","DP-2","DP-3";

		   qcom,lease-planes = "plane-0","plane-1","plane-2","plane-3",

					"plane-4", "plane-5", "plane-6",

					"plane-7","plane-8","plane-9";
@@ -392,8 +331,8 @@ 
	sde_card3: qcom,sde-kms-lease@2 {

		   compatible = "qcom,sde-kms-lease";

		   qcom,dev-name = "msm_drm3";

		   qcom,lease-connectors = "DSI-3", "DP-5";

		   qcom,lease-planes = "plane-3-splash", "plane-2-splash";

		   qcom,lease-connectors = "DSI-3";

		   qcom,lease-planes = "plane-3-splash";

	   };



};

arch/arm64/boot/dts/qcom/sa8155-adp-star-display.dtsi

+3 −63
Original line number Diff line number Diff line
@@ -380,59 +380,6 @@ 
		 };

	 };



	sde_sh_base1: qcom,shared-display-base@1 {

		      qcom,shared-display-base-intf = <0>;

		      qcom,shared-display-base-mode {

			      qcom,mode-h-active = <1920>;

			      qcom,mode-h-front-porch = <88>;

			      qcom,mode-h-pulse-width = <44>;

			      qcom,mode-h-back-porch = <148>;

			      qcom,mode-h-active-high;

			      qcom,mode-v-active = <1080>;

			      qcom,mode-v-front-porch = <4>;

			      qcom,mode-v-pulse-width = <5>;

			      qcom,mode-v-back-porch = <36>;

			      qcom,mode-v-active-high;

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

			      qcom,mode-clock-in-khz = <148500>;

		      };

	      };





	sde_sh3: qcom,shared-display@3 {

		 compatible = "qcom,shared-display";

		 qcom,shared-display-base = <&sde_sh_base1>;

		 qcom,blend-stage-range = <0 9>;

		 qcom,shared-display-name = "shared-disp-3";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;

			 qcom,mode-v-active = <1080>;

		 };

		 qcom,shared-display-dst-mode {

			 qcom,mode-x-offset = <0>;

			 qcom,mode-y-offset = <0>;

			 qcom,mode-width = <1920>;

			 qcom,mode-height = <1080>;

		 };

	 };



	sde_sh4: qcom,shared-display@4 {

		 compatible = "qcom,shared-display";

		 qcom,shared-display-base = <&sde_sh_base1>;

		 qcom,blend-stage-range = <9 1>;

		 qcom,shared-display-name = "shared-disp-4";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;

			 qcom,mode-v-active = <1080>;

		 };

		 qcom,shared-display-dst-mode {

			 qcom,mode-x-offset = <0>;

			 qcom,mode-y-offset = <0>;

			 qcom,mode-width = <1920>;

			 qcom,mode-height = <1080>;

		 };

	 };



	 qcom,sde-shared-plane {

		 compatible = "qcom,sde-shared-plane";

		 qcom,add-planes {
@@ -449,20 +396,13 @@ 
				 qcom,plane-init-handoff;

				 qcom,plane-seamless-mode = "shared";

			 };

			 plane@2 {

				 qcom,plane-name = "plane-2-splash";

				 qcom,plane-parent = "plane-2";

				 qcom,plane-init-active;

				 qcom,plane-init-handoff;

				 qcom,plane-seamless-mode = "shared";

			 };

		 };

	 };



	sde_card1: qcom,sde-kms-lease@0 {

		   compatible = "qcom,sde-kms-lease";

		   qcom,dev-name = "msm_drm";

		   qcom,lease-connectors = "DSI-2", "DSI-3", "DP-4", "DP-2",

		   qcom,lease-connectors = "DSI-2", "DSI-3", "DP-1", "DP-2",

						"DP-3";

		   qcom,lease-planes = "plane-0", "plane-1", "plane-2",

					"plane-3","plane-4", "plane-5",
@@ -480,8 +420,8 @@ 
	sde_card3: qcom,sde-kms-lease@2 {

		   compatible = "qcom,sde-kms-lease";

		   qcom,dev-name = "msm_drm3";

		   qcom,lease-connectors = "DSI-4","DP-5";

		   qcom,lease-planes = "plane-3-splash", "plane-2-splash";

		   qcom,lease-connectors = "DSI-4";

		   qcom,lease-planes = "plane-3-splash";

	   };



};