di: increase di_cma for two channel di [1/2]

PD#SWPL-18329

Problem:
enable two channel di

Solution:
increase di_cma for two channel di

Verify:
Verify on u212

Change-Id: I2ec87a52fc3e3beea5daae80c24d877385ec6818
Signed-off-by: jintao xu <jintao.xu@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
index c752608675564689fa05888d75c5fd82931bbb91..da5972209e4b6a7c2d6973a73adcd8536ed4c093 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -109,7 +109,7 @@
                         * 10x4074560=40M(0x28) support 10bit
                         */
                        //size = <0x02800000>;
-                       size = <0x05800000>;
+                       size = <0x0B000000>;
                        alignment = <0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 8926afa68fa2f805512548a41aba77be2bebce7a..f4b79b7f012a589127e342b485442d7da1ba8bd2 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -110,7 +110,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x05800000>;
+                       size = <0x0B000000>;
                        alignment = <0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 9371f6e90fa669ffab0f8e5d367b99f029e2cce3..755ef144427fba92d5d8329b3361b777805a3237 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -110,7 +110,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x05800000>;
+                       size = <0x0B000000>;
                        alignment = <0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
index a116ead97308c6fd9694d116ea88920e0bdfc59e..601ab478fe5838ac380bcbd9e62447c42e5dee5c 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -110,7 +110,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x05800000>;
+                       size = <0x0B000000>;
                        alignment = <0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
index 53fc64661fde6c4579b222e7992581e9a367342b..1c317993f30ecc7e762bc983dcb1c5386212bb18 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
@@ -101,7 +101,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x02800000>;
+                       size = <0x0B000000>;
                        alignment = <0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
index 76b0d46c69f5a3f468a1012bf779e7db7ea69410..534d58149b7d1f20f8c9a721bac1dfc64526ff76 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
@@ -110,7 +110,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x05800000>;
+                       size = <0x0B000000>;
                        alignment = <0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
index 238f82405e8c95e6feb324acd98575e38bcd22f5..6659d297c681ff2ba3eb062f5c5933548c2afd8b 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
@@ -101,7 +101,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x05800000>;
+                       size = <0x0B000000>;
                        alignment = <0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index cd2c614e321eb4471867341412354ad4c4371f8d..72b4285cf599ee2de23dd4b17c63488b187d5a02 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -108,7 +108,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x05800000>;
+                       size = <0x0 0x0B000000>;
                        alignment = <0x0 0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 3322c284d5dbcb9a1e1bf657e0880e6f4cdacbde..a3f6ba5015316525857036b0f554fc01960cdf73 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -109,7 +109,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x05800000>;
+                       size = <0x0 0x0B000000>;
                        alignment = <0x0 0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
index d1d441d697304e8d70bcc5aa01d0ee7a7a408c3f..848d3b8b1f1fdb4daaa917f770693831ad8c5068 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -109,7 +109,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x05800000>;
+                       size = <0x0 0x0B000000>;
                        alignment = <0x0 0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
index 1b6c39d878b3b6181add569ee670fe97cb3e819a..1730792a5d548bf679474d575a647454266cd747 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -109,7 +109,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x05800000>;
+                       size = <0x0 0x0B000000>;
                        alignment = <0x0 0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
index fd5fd75a58f54d8f12c691bfe383f880ca9442b9..98e6379328cb69ff4a8182e3c42b9229c28d67fd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
@@ -100,7 +100,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x02800000>;
+                       size = <0x0 0x0B000000>;
                        alignment = <0x0 0x400000>;
                };
                /*  POST PROCESS MANAGER */
@@ -292,8 +292,8 @@
                status = "okay";
        };
 
-       deinterlace {
-               compatible = "amlogic, deinterlace";
+       multi-di {
+               compatible = "amlogic, dim-sm1";
                status = "okay";
                /* 0:use reserved; 1:use cma; 2:use cma as reserved */
                flag_cma = <1>;
@@ -316,6 +316,32 @@
                nrds-enable = <1>;
                pps-enable = <1>;
        };
+
+       deinterlace {
+               compatible = "amlogic, deinterlace";
+               status = "disable";//status = "okay";
+               /* 0:use reserved; 1:use cma; 2:use cma as reserved */
+               flag_cma = <1>;
+               //memory-region = <&di_reserved>;
+               //memory-region = <&di_cma_reserved>;
+               interrupts = <0 46 1
+                               0 40 1>;
+               interrupt-names = "pre_irq", "post_irq";
+               clocks = <&clkc CLKID_VPU_CLKB_TMP_COMP>,
+                       <&clkc CLKID_VPU_CLKB_COMP>;
+               clock-names = "vpu_clkb_tmp_composite",
+                       "vpu_clkb_composite";
+               clock-range = <334 667>;
+               /* buffer-size = <3621952>;(yuv422 8bit) */
+               buffer-size = <4074560>;/*yuv422 fullpack*/
+               /* reserve-iomap = "true"; */
+               /* if enable nr10bit, set nr10bit-support to 1 */
+               post-wr-support = <1>;
+               nr10bit-support = <1>;
+               nrds-enable = <1>;
+               pps-enable = <1>;
+       };
+
        dvb {
                compatible = "amlogic, dvb";
                dev_name = "dvb";

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
index c2723f1a2aca772420af03443cc81802d88e1752..8d189b0bcaea1ed439c91d2fa650a97261cbb2e9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
@@ -109,7 +109,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x05800000>;
+                       size = <0x0 0x0B000000>;
                        alignment = <0x0 0x400000>;
                };
                /*  POST PROCESS MANAGER */

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
index 7aa731550c2c6ce3be0104898c154ad76c1ca2cd..bc4f7bebffd7a3506377b7897f3e549a5612c45b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
@@ -100,7 +100,7 @@
                         * 10x4736064=45.2M(0x2e) support 12bit
                         * 10x4074560=40M(0x28) support 10bit
                         */
-                       size = <0x0 0x05800000>;
+                       size = <0x0 0x0B000000>;
                        alignment = <0x0 0x400000>;
                };
                /*  POST PROCESS MANAGER */