projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4c2ef0a)
dts: Multi-screen enable [2/3]
authorGongwei Chen <gongwei.chen@amlogic.com>
Fri, 2 Aug 2019 06:29:29 +0000 (14:29 +0800)
committerGongwei Chen <gongwei.chen@amlogic.com>
Fri, 2 Aug 2019 07:34:04 +0000 (00:34 -0700)
PD#SWPL-12213

Problem:
Multi-screen support.

Solution:
Display is blank when panel use the same clk with cvbs.

Verify:
1. Primary screen display with HDMI.
2. Extend screen display with panel.
3. Primary and extend screen can display the same UI or difference.

Change-Id: Id2189c32a8ee4bb0c1384352d91536c7310d5670
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
12 files changed:
arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts patch | blob | blame | history
arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts patch | blob | blame | history
arch/arm/boot/dts/amlogic/mesong12a_skt-panel.dtsi patch | blob | blame | history
arch/arm/boot/dts/amlogic/mesonsm1_skt-panel.dtsi patch | blob | blame | history
arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts patch | blob | blame | history
arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/mesong12a_skt-panel.dtsi patch | blob | blame | history
arch/arm64/boot/dts/amlogic/mesonsm1_skt-panel.dtsi patch | blob | blame | history
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts patch | blob | blame | history
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts patch | blob | blame | history

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
index 32171556913cd68b5759c0d290eb06cd29b0bf64..be1dddeb7929780041f171d6e8fd9e82c424d60f 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
@@ -187,7 +187,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* g12a */
@@ -520,7 +520,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1650,3 +1650,15 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
index 1070f9d94d3a6a7d003ee137a0c369e3c72abf97..57f59780e775432a91c69388fed329b1b7658ed7 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
@@ -191,7 +191,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* g12a */
@@ -524,7 +524,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1494,3 +1494,15 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
diff --git a/arch/arm/boot/dts/amlogic/mesong12a_skt-panel.dtsi b/arch/arm/boot/dts/amlogic/mesong12a_skt-panel.dtsi
index 96c61d704115c09084a2f93bf6eda031be8eb834..1a7244812acc3856163c50040d130d78f62fd7a2 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesong12a_skt-panel.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12a_skt-panel.dtsi
@@ -16,7 +16,7 @@
  */
 
 / {
-       lcd{
+       lcd:lcd{
                compatible = "amlogic, lcd-g12a";
                dev_name = "lcd";
                mode = "tablet";
diff --git a/arch/arm/boot/dts/amlogic/mesonsm1_skt-panel.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1_skt-panel.dtsi
index e47b54d67ec77d0b1907d50525537fbfd7d5de21..c3a1a75f8f94d655d55dc4e0662f6020f26d1f84 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesonsm1_skt-panel.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1_skt-panel.dtsi
@@ -16,7 +16,7 @@
  */
 
 / {
-       lcd{
+       lcd:lcd{
                compatible = "amlogic, lcd-sm1";
                dev_name = "lcd";
                mode = "tablet";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 99155135d0087091d9370bbf3588706621010748..40a50b735f4f5fe46d5244e09a1a44e5b04d0c2d 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -190,7 +190,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* sm1 */
@@ -542,7 +542,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1869,3 +1869,15 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index 9f7f5d8d8bf8f96ab08f53f56a02a4647229f9f7..1ac891ad7f8838e8bad6521be29d188dd3d971ce 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -190,7 +190,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* sm1 */
@@ -542,7 +542,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1869,3 +1869,15 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
index d2f274a8da8ee18089b2f2acae6f62542afeacaf..b78d4b083bf08ba9a9ab5bf3928ee37de9e996ac 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
@@ -186,7 +186,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* g12a */
@@ -519,7 +519,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1649,3 +1649,15 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
index 7d53dc3c8cdce068dc6fcb8be0f8cdb09511eacc..4a2ad2b28b3d825cbc7ba89064ba2d1356e7db4a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
@@ -185,7 +185,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* g12a */
@@ -518,7 +518,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1488,3 +1488,15 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
diff --git a/arch/arm64/boot/dts/amlogic/mesong12a_skt-panel.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a_skt-panel.dtsi
index 18c7b6dc7fe441378adbc8514219af2450fe9b06..6bc89e08f9a784b393da05545a679802dc9302ab 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12a_skt-panel.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a_skt-panel.dtsi
@@ -16,7 +16,7 @@
  */
 
 / {
-       lcd{
+       lcd:lcd{
                compatible = "amlogic, lcd-g12a";
                mode = "tablet";
                status = "okay";
diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1_skt-panel.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1_skt-panel.dtsi
index 7fceb00a418e10a62d73df384555716a92ac0b21..8b54f4294b1bc6b4ab71cf9d6e9a7bc6d7a53254 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesonsm1_skt-panel.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1_skt-panel.dtsi
@@ -16,7 +16,7 @@
  */
 
 / {
-       lcd{
+       lcd:lcd{
                compatible = "amlogic, lcd-sm1";
                mode = "tablet";
                status = "okay";
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
index f83e7b540b798f4cd0c9a21133909329f3d07155..7892a26935702da00e851b84d481e7d611418d4a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -188,7 +188,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* sm1 */
@@ -540,7 +540,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1867,3 +1867,15 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index e08ae57c29685c45d250caa1efe685377ca8d4b4..794ccbf61dccd4adabb4b7677344b1b3b3bbf425 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -188,7 +188,7 @@
                /* 1:gp0_pll vid2_clk */
                /* 2:vid_pll vid1_clk */
                /* 3:gp0_pll vid1_clk */
-               clk_path = <0>;
+               clk_path = <2>;
 
                /* performance: reg_address, reg_value */
                /* sm1 */
@@ -540,7 +540,7 @@
                compatible = "amlogic, vecm";
                dev_name = "aml_vecm";
                status = "okay";
-               gamma_en = <0>;/*1:enabel ;0:disable*/
+               gamma_en = <1>;/*1:enabel ;0:disable*/
                wb_en = <0>;/*1:enabel ;0:disable*/
                cm_en = <0>;/*1:enabel ;0:disable*/
                /*0: 709/601  1: bt2020*/
@@ -1868,3 +1868,16 @@
        status = "okay";
 };
 
+&lcd {
+       clk_path = <1>;
+};
+
+&gpu{
+       tbl =  <&dvfs285_cfg
+               &dvfs400_cfg
+               &dvfs500_cfg
+               &dvfs666_cfg
+               &dvfs800_cfg
+               &dvfs800_cfg>;
+};
+