shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

dts: tv: optimize ion and codec_mm_cma usage [1/1]

Browse Source 
PD#SWPL-334

Problem:
gfx graphics test fail caused by low memory

Solution:
enlarge ion and reduce codec_mm_cma

Verify:
verified by p321

Change-Id: I8dc3bfa35a4093199291f21ed0c80ce51e38ea81
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
This commit is contained in:
Lei Qian
2018-10-11 15:22:06 +08:00
committed by Jianxin Pan
parent 7a6884e2aa
commit ffd89f6c33
3 changed files with 43 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
arch/arm/boot/dts/amlogic/txl_t962_p321.dts
View File

@@ -81,43 +81,12 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
/* if no direct render, ion size = fb0_size x 3 + fb1_size + 4 M */
size = <0x2400000>;
size = <0x7400000>;
alignment = <0x400000>;
/* alloc by self */
alloc-ranges = <0x0 0x2ee00000>;
};
codec_mm_cma:linux,codec_mm_cma {
compatible = "shared-dma-pool";
reusable;
/* ion_codec_mm max can alloc size 80M*/
size = <0x13400000>;
alignment = <0x400000>;
linux,contiguous-region;
/** alloc by self **/
alloc-ranges = <0x0 0x2ee00000>;
};
/* codec shared reserved */
codec_mm_reserved:linux,codec_mm_reserved {
compatible = "amlogic, codec-mm-reserved";
size = <0x0>;
alignment = <0x100000>;
//no-map;
};
//di_reserved:linux,di {
//compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */
/* 4179008(yuv422 10bit full pack mode) */
/** 10x3621952=34.6M(0x23) support 8bit **/
/** 10x4736064=45.2M(0x2e) support 12bit **/
/** 10x4179008=40M(0x28) support 10bit **/
//size = <0x2800000>;
//no-map;
//};
/*di CMA pool */
di_cma_reserved:linux,di_cma {
compatible = "shared-dma-pool";
@@ -141,6 +110,17 @@
alloc-ranges = <0x32000000 0xc800000>;
};
codec_mm_cma:linux,codec_mm_cma {
compatible = "shared-dma-pool";
reusable;
/* ion_codec_mm max can alloc size 80M*/
size = <0xc000000>;
alignment = <0x400000>;
linux,contiguous-region;
/** alloc by self **/
alloc-ranges = <0x0 0x2ee00000>;
};
picdec_cma_reserved:linux,picdec {
compatible = "shared-dma-pool";
reusable;
@@ -150,6 +130,14 @@
alloc-ranges = <0x32000000 0xc800000>;
};
/* codec shared reserved */
codec_mm_reserved:linux,codec_mm_reserved {
compatible = "amlogic, codec-mm-reserved";
size = <0x0>;
alignment = <0x100000>;
//no-map;
};
demod_cma_reserved:linux,demod_cma {
compatible = "shared-dma-pool";
reusable;
@@ -164,7 +152,7 @@
compatible = "shared-dma-pool";
reusable;
/* 1920x1080x2x4 =16 M */
size = <0x04000000>;
size = <0x01000000>;
alignment = <0x400000>;
/** alloc by self **/
alloc-ranges = <0x32000000 0xc800000>;

50
arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
View File

@@ -81,39 +81,10 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
// if no direct render, ion size = fb0_size x 3 + fb1_size + 4 M
size = <0x0 0x2400000>;
size = <0x0 0x7400000>;
alignment = <0x0 0x400000>;
};
codec_mm_cma:linux,codec_mm_cma {
compatible = "shared-dma-pool";
reusable;
/* ion_codec_mm max can alloc size 80M*/
size = <0x0 0x13400000>;
alignment = <0x0 0x400000>;
linux,contiguous-region;
};
/* codec shared reserved */
codec_mm_reserved:linux,codec_mm_reserved {
compatible = "amlogic, codec-mm-reserved";
size = <0x0 0x0>;
alignment = <0x0 0x100000>;
//no-map;
};
//di_reserved:linux,di {
//compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */
/* 4179008(yuv422 10bit full pack mode) */
/** 10x3621952=34.6M(0x23) support 8bit **/
/** 10x4736064=45.2M(0x2e) support 12bit **/
/** 10x4179008=40M(0x28) support 10bit **/
//size = <0x0 0x2800000>;
//no-map;
//};
/*di CMA pool */
di_cma_reserved:linux,di_cma {
compatible = "shared-dma-pool";
@@ -135,6 +106,15 @@
size = <0x0 0x0>;
};
codec_mm_cma:linux,codec_mm_cma {
compatible = "shared-dma-pool";
reusable;
/* ion_codec_mm max can alloc size 80M*/
size = <0x0 0xc000000>;
alignment = <0x0 0x400000>;
linux,contiguous-region;
};
picdec_cma_reserved:linux,picdec {
compatible = "shared-dma-pool";
reusable;
@@ -143,6 +123,14 @@
linux,contiguous-region;
};
/* codec shared reserved */
codec_mm_reserved:linux,codec_mm_reserved {
compatible = "amlogic, codec-mm-reserved";
size = <0x0 0x0>;
alignment = <0x0 0x100000>;
//no-map;
};
demod_cma_reserved:linux,demod_cma {
compatible = "shared-dma-pool";
reusable;
@@ -156,7 +144,7 @@
compatible = "shared-dma-pool";
reusable;
/* 1920x1080x2x4 =16 M */
size = <0x0 0x04000000>;
size = <0x0 0x01000000>;
alignment = <0x0 0x400000>;
};
}; /* end of reserved-memory */

6
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
View File

@@ -95,7 +95,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2000000>;
size = <0x0 0x6400000>;
alignment = <0x0 0x400000>;
};
@@ -124,7 +124,7 @@
compatible = "shared-dma-pool";
reusable;
/* ion_codec_mm max can alloc size 80M*/
size = <0x0 0x11000000>;
size = <0x0 0xc000000>;
alignment = <0x0 0x400000>;
linux,contiguous-region;
};
@@ -561,7 +561,7 @@
compatible = "amlogic, vbi";
memory-region = <&vbi_reserved>;
dev_name = "vbi";
status = "disabled";
status = "okay";
interrupts = <0 83 1>;
reserve-iomap = "true";
};