summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamus Wong <camusw@codeaurora.org>2017-11-01 12:32:04 -0400
committerRahul Sharma <sharah@codeaurora.org>2017-11-06 16:34:13 +0530
commit4bf823c3a8e5a19381271662d46c1ddec61437ba (patch)
tree89f51ce296d992faa7705aa45e61dfe553df734f
parentfc86e52281ffd5c124f03de495fd52b7c67da491 (diff)
ARM: dts: msm: Remove the virtual plane implementation on msm8996
Virtual plane limited the usage of plane on assigned display only. It is against the implementation in strategy manager in SDM, which assume any plane can be used by any display. Change-Id: Iddcb94d888dfa1ec7685f2964116b4296a0e9a7f Signed-off-by: Camus Wong <camusw@codeaurora.org> Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi71
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi71
2 files changed, 0 insertions, 142 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index 343c6a2ee2da..fe1e259b1804 100644
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -549,77 +549,6 @@
&sde_kms {
qcom,mdss-pref-prim-intf = "dsi";
- qcom,sde-plane-id-map {
- qcom,sde-plane-id@0 {
- reg = <0x0>;
- qcom,display-type = "primary";
- qcom,plane-name = "rgb0", "rgb1";
- qcom,plane-type = "primary";
- };
-
- qcom,sde-plane-id@1 {
- reg = <0x1>;
- qcom,display-type = "primary";
- qcom,plane-name = "vig0", "vig1";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@2 {
- reg = <0x2>;
- qcom,display-type = "primary";
- qcom,plane-name = "cursor0";
- qcom,plane-type = "cursor";
- };
-
- qcom,sde-plane-id@3 {
- reg = <0x3>;
- qcom,display-type = "secondary";
- qcom,plane-name = "rgb2";
- qcom,plane-type = "primary";
- };
-
- qcom,sde-plane-id@4 {
- reg = <0x4>;
- qcom,display-type = "secondary";
- qcom,plane-name = "vig2";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@5 {
- reg = <0x5>;
- qcom,display-type = "secondary";
- qcom,plane-name = "dma0";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@6 {
- reg = <0x6>;
- qcom,display-type = "secondary";
- qcom,plane-name = "cursor1";
- qcom,plane-type = "cursor";
- };
-
- qcom,sde-plane-id@7 {
- reg = <0x7>;
- qcom,display-type = "tertiary";
- qcom,plane-name = "rgb3";
- qcom,plane-type = "primary";
- };
-
- qcom,sde-plane-id@8 {
- reg = <0x8>;
- qcom,display-type = "tertiary";
- qcom,plane-name = "vig3";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@9 {
- reg = <0x9>;
- qcom,display-type = "tertiary";
- qcom,plane-name = "dma1";
- qcom,plane-type = "overlay";
- };
- };
};
&dsi_adv_7533_1 {
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index 682a745b30e8..ef2bfe4eed57 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -335,77 +335,6 @@
&sde_kms {
qcom,mdss-pref-prim-intf = "dsi";
- qcom,sde-plane-id-map {
- qcom,sde-plane-id@0 {
- reg = <0x0>;
- qcom,display-type = "primary";
- qcom,plane-name = "rgb0", "rgb1";
- qcom,plane-type = "primary";
- };
-
- qcom,sde-plane-id@1 {
- reg = <0x1>;
- qcom,display-type = "primary";
- qcom,plane-name = "vig0", "vig1";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@2 {
- reg = <0x2>;
- qcom,display-type = "primary";
- qcom,plane-name = "cursor0";
- qcom,plane-type = "cursor";
- };
-
- qcom,sde-plane-id@3 {
- reg = <0x3>;
- qcom,display-type = "secondary";
- qcom,plane-name = "rgb2";
- qcom,plane-type = "primary";
- };
-
- qcom,sde-plane-id@4 {
- reg = <0x4>;
- qcom,display-type = "secondary";
- qcom,plane-name = "vig2";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@5 {
- reg = <0x5>;
- qcom,display-type = "secondary";
- qcom,plane-name = "dma0";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@6 {
- reg = <0x6>;
- qcom,display-type = "secondary";
- qcom,plane-name = "cursor1";
- qcom,plane-type = "cursor";
- };
-
- qcom,sde-plane-id@7 {
- reg = <0x7>;
- qcom,display-type = "tertiary";
- qcom,plane-name = "rgb3";
- qcom,plane-type = "primary";
- };
-
- qcom,sde-plane-id@8 {
- reg = <0x8>;
- qcom,display-type = "tertiary";
- qcom,plane-name = "vig3";
- qcom,plane-type = "overlay";
- };
-
- qcom,sde-plane-id@9 {
- reg = <0x9>;
- qcom,display-type = "tertiary";
- qcom,plane-name = "dma1";
- qcom,plane-type = "overlay";
- };
- };
};
&dsi_adv_7533_1 {