From e47951d492cb8894d2a5ce2cc54e265abf1b6545 Mon Sep 17 00:00:00 2001 From: jintao xu Date: Tue, 10 Dec 2019 18:49:14 +0800 Subject: [PATCH] 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 --- .../arm/boot/dts/amlogic/g12a_s905x2_u212.dts | 2 +- .../arm/boot/dts/amlogic/sm1_s905d3_ac200.dts | 2 +- .../arm/boot/dts/amlogic/sm1_s905d3_ac202.dts | 2 +- .../arm/boot/dts/amlogic/sm1_s905x3_ac213.dts | 2 +- .../amlogic/sm1_s905x3_ac213_buildroot.dts | 2 +- .../arm/boot/dts/amlogic/sm1_s905x3_ac214.dts | 2 +- .../amlogic/sm1_s905x3_ac214_buildroot.dts | 2 +- .../boot/dts/amlogic/g12a_s905x2_u212.dts | 2 +- .../boot/dts/amlogic/sm1_s905d3_ac200.dts | 2 +- .../boot/dts/amlogic/sm1_s905d3_ac202.dts | 2 +- .../boot/dts/amlogic/sm1_s905x3_ac213.dts | 2 +- .../amlogic/sm1_s905x3_ac213_buildroot.dts | 32 +++++++++++++++++-- .../boot/dts/amlogic/sm1_s905x3_ac214.dts | 2 +- .../amlogic/sm1_s905x3_ac214_buildroot.dts | 2 +- 14 files changed, 42 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts index c75260867556..da5972209e4b 100644 --- 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 8926afa68fa2..f4b79b7f012a 100644 --- 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 9371f6e90fa6..755ef144427f 100644 --- 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 a116ead97308..601ab478fe58 100644 --- 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 53fc64661fde..1c317993f30e 100644 --- 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 76b0d46c69f5..534d58149b7d 100644 --- 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 238f82405e8c..6659d297c681 100644 --- 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 cd2c614e321e..72b4285cf599 100644 --- 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 3322c284d5db..a3f6ba501531 100644 --- 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 d1d441d69730..848d3b8b1f1f 100644 --- 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 1b6c39d878b3..1730792a5d54 100644 --- 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 fd5fd75a58f5..98e6379328cb 100644 --- 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 c2723f1a2aca..8d189b0bcaea 100644 --- 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 7aa731550c2c..bc4f7bebffd7 100644 --- 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 */ -- 2.20.1