shinys000114/kernel_common_drivers
1
0
Fork 0
mirror of https://github.com/hardkernel/kernel_common_drivers.git synced 2026-06-25 12:03:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

dts: modify android_u S805X2 1.5G codec_mm_cma size to 168MB. [2/2]

Browse Source 
PD#SWPL-162202

Problem:
Adjust the size of codec_mm cma to 168M.

Solution:
Adjust the size of codec_mm cma to 168M.

Verify:
S805X2

Change-Id: I8d9987f6f817decc03f0b3b65d38683a2bff6233
Signed-off-by: yu.xie <yu.xie@amlogic.com>
This commit is contained in:
yu.xie
2024-04-11 03:11:53 +00:00
committed by gerrit autosubmit
parent fad876c48c
commit ccbd3e42b4
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/amlogic/s4_s805x2_aq222_drm_1.5g.dts
+12 -7
View File
@@ -86,7 +86,7 @@
logo_reserved:linux,meson-fb {
compatible = "amlogic, meson-fb";
alignment = <0x400000>;
reg = <0x5f800000 0x800000>;
reg = <0x3f800000 0x800000>;
};
ion_cma_reserved:linux,ion-dev {
@@ -107,6 +107,7 @@
/* 1080p STB androidT size 56M */
size = <0x3800000>;
alignment = <0x400000>;
alloc-ranges = <0x30000000 0x10000000>;
};
dmaheap_cma_reserved:heap-gfx {
compatible = "shared-dma-pool";
@@ -114,6 +115,7 @@
/* 1080p STB androidT size 88M */
size = <0x5800000>;
alignment = <0x400000>;
alloc-ranges = <0x0 0x30000000>;
};
/*di CMA pool */
di_cma_reserved:linux,di_cma {
@@ -141,11 +143,12 @@
compatible = "shared-dma-pool";
reusable;
/*
* DTV FCC is the largest scenario, requiring 328MB.
* Two-channel 1080i HEVC secure playback
* requires at least 168MB without DTV enable
*/
size = <0x14800000>;
size = <0xa800000>;
alignment = <0x400000>;
alloc-ranges = <0x30000000 0x50000000>;
alloc-ranges = <0x30000000 0x10000000>;
linux,contiguous-region;
};
@@ -162,6 +165,7 @@
no-map;
size = <0x400000>;
alignment = <0x100000>;
alloc-ranges = <0x30000000 0x10000000>;
};
/* vdin0 CMA pool */
@@ -183,6 +187,7 @@
*/
size = <0x00800000>;
alignment = <0x400000>;
alloc-ranges = <0x30000000 0x10000000>;
};
/* global autoconfigured region for contiguous allocations */
@@ -192,7 +197,7 @@
size = <0x800000>;
alignment = <0x400000>;
linux,cma-default;
alloc-ranges = <0x0 0x30000000>;
alloc-ranges = <0x30000000 0x10000000>;
};
};
codec_mm {
@@ -1509,14 +1514,14 @@
status = "disabled";
display_size_default = <1920 1080 1920 2160 32>;
mem_size = <0x00800000 0x1980000 0x100000>;
logo_addr = "0x5f800000";
logo_addr = "0x3f800000";
mem_alloc = <0>;
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
};
&drm_vpu {
status = "okay";
logo_addr = "0x5f800000";
logo_addr = "0x3f800000";
};
arch/arm64/boot/dts/amlogic/s4_s805x2_aq222_drm_1.5g.dts
+12 -5
View File
@@ -85,7 +85,7 @@
logo_reserved:linux,meson-fb {
compatible = "amlogic, meson-fb";
alignment = <0x0 0x400000>;
reg = <0x0 0x5f800000 0x0 0x800000>;
reg = <0x0 0x3f800000 0x0 0x800000>;
};
ion_cma_reserved:linux,ion-dev {
@@ -106,6 +106,7 @@
/* 1080p STB androidT size 56M */
size = <0x0 0x3800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x30000000 0x0 0x10000000>;
};
dmaheap_cma_reserved:heap-gfx {
compatible = "shared-dma-pool";
@@ -113,6 +114,7 @@
/* 1080p STB androidT size 88M */
size = <0x0 0x5800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x00000000 0x0 0x30000000>;
};
/*di CMA pool */
di_cma_reserved:linux,di_cma {
@@ -140,10 +142,12 @@
compatible = "shared-dma-pool";
reusable;
/*
* DTV FCC is the largest scenario, requiring 328MB.
* Two-channel 1080i HEVC secure playback
* requires at least 168MB without DTV enable
*/
size = <0x0 0x14800000>;
size = <0x0 0xa800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x30000000 0x0 0x10000000>;
linux,contiguous-region;
};
@@ -160,6 +164,7 @@
no-map;
size = <0x0 0x400000>;
alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x30000000 0x0 0x10000000>;
};
/* vdin0 CMA pool */
@@ -181,6 +186,7 @@
*/
size = <0x0 0x00800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x30000000 0x0 0x10000000>;
};
/* global autoconfigured region for contiguous allocations */
@@ -190,6 +196,7 @@
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
linux,cma-default;
alloc-ranges = <0x0 0x30000000 0x0 0x10000000>;
};
};
codec_mm {
@@ -1506,14 +1513,14 @@
status = "disabled";
display_size_default = <1920 1080 1920 2160 32>;
mem_size = <0x00800000 0x1980000 0x100000>;
logo_addr = "0x5f800000";
logo_addr = "0x3f800000";
mem_alloc = <0>;
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
};
&drm_vpu {
status = "okay";
logo_addr = "0x5f800000";
logo_addr = "0x3f800000";
};