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

dts: fix fb_reserved/logo_reserved alloc failed

Browse Source 
PD#150868: fix fb_reserved/logo_reserved alloc failed

Change-Id: Ibae0efc18b221bc72c419b99d908bf4ae1267d4b
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
This commit is contained in:
Pengcheng Chen
2017-09-19 13:27:41 +08:00
committed by Jianxin Pan
parent 9487af325b
commit afcba67e26
12 changed files with 107 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
View File

@@ -63,6 +63,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -77,13 +85,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;

19
arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts
View File

@@ -34,7 +34,9 @@
serial3 = &uart_C;
serial4 = &uart_AO_B;
};
ion_dev {
compatible = "amlogic, ion_dev";
};
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x0100000 0x0 0x3ff00000>;
@@ -58,6 +60,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3dc00000 0x0 0x2400000>;
};
//don't put other dts in front of fb_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -72,13 +82,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3dc00000 0x0 0x2400000>;
};
/* vdin0 CMA pool */
//vdin0_cma_reserved:linux,vdin0_cma {
// compatible = "shared-dma-pool";

15
arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
View File

@@ -72,6 +72,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -86,13 +94,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;

20
arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts
View File

@@ -35,7 +35,9 @@
serial3 = &uart_C;
serial4 = &uart_AO_B;
};
ion_dev {
compatible = "amlogic, ion_dev";
};
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
@@ -59,6 +61,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
//don't put other dts in front of fb_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -73,14 +83,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
/* vdin0 CMA pool */
//vdin0_cma_reserved:linux,vdin0_cma {
// compatible = "shared-dma-pool";

15
arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
View File

@@ -64,6 +64,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -78,13 +86,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;

15
arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts
View File

@@ -64,6 +64,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -78,13 +86,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;

15
arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts
View File

@@ -64,6 +64,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -78,13 +86,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;

20
arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts
View File

@@ -35,7 +35,9 @@
serial3 = &uart_C;
serial4 = &uart_AO_B;
};
ion_dev {
compatible = "amlogic, ion_dev";
};
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
@@ -59,6 +61,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
//don't put other dts in front of fb_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -73,13 +83,7 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
/* vdin0 CMA pool */
//vdin0_cma_reserved:linux,vdin0_cma {

13
arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
View File

@@ -64,10 +64,13 @@
no-map;
};
fb_reserved:linux,meson-fb {
compatible = "amlogic, fb-memory";
reg = <0x0 0x3f000000 0x0 0x1000000>;
no-map;
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x1000000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f000000 0x0 0x1000000>;
};
//don't put other dts in front of fb_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -773,14 +776,14 @@
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
mem_size = <0x006AF000 0x00b00000 0x00100000>;
mem_size = <0x00300000 0x00b00000 0x00100000>;
/* uboot logo,fb0/fb1 memory size */
display_mode_default = "720p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1280 720 1280 2160 32>;
/*1920*1080*4*3 = 0x17BB000*/
logo_addr = "0x3fb00000";
logo_addr = "0x3f000000";
};
ge2d {
compatible = "amlogic, ge2d";

16
arch/arm64/boot/dts/amlogic/gxl_skt.dts
View File

@@ -62,6 +62,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -76,13 +84,7 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;

15
arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
View File

@@ -63,6 +63,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -77,13 +85,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;

15
arch/arm64/boot/dts/amlogic/gxm_skt.dts
View File

@@ -63,6 +63,14 @@
reg = <0x0 0x05300000 0x0 0x2000000>;
no-map;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
//don't put other dts in front of logo_reserved
//di_reserved:linux,di {
// compatible = "amlogic, di-mem";
@@ -77,13 +85,6 @@
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;