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

ion_dev: enlarge cam heap size .[1/1]

Browse Source 
PD#153134: some dEQP cases should always use direct render

Change-Id: I9bcde1632d27674e065771a2871e6e1bb193cb07
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
This commit is contained in:
pengcheng chen
2018-03-14 17:33:45 +08:00
committed by Sandy Luo
parent b6bd5da274
commit a50ba8417c
3 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
View File

@@ -38,6 +38,11 @@
serial4 = &uart_AO_B;
};
ion_dev {
compatible = "amlogic, ion_dev";
memory-region = <&ion_reserved>;
};
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x100000 0x0 0x7ff00000>;
@@ -71,18 +76,14 @@
// no-map;
//};
//pstore:aml_pstore {
// compatible = "amlogic, pstore";
// reg = <0x0 0x07300000 0x0 0x100000>;
// no-map;
//};
fb_reserved:linux,meson-fb {
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x1c00000>;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7e400000 0x0 0x1c00000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
//carveout_reserved:linux,carveout-reserve {
@@ -93,7 +94,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x5C00000>;
size = <0x0 0x7C00000>;
alignment = <0x0 0x400000>;
};
@@ -240,21 +241,21 @@
meson-fb {
compatible = "amlogic, meson-txlx";
memory-region = <&fb_reserved>;
memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
mem_size = <0x00800000 0x01000000 0x00100000>;
mem_size = <0x00800000 0x01800000 0x00100000>;
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
/* 0:VPU free scale 1:OSD free scale 2:OSD super scale */
scale_mode = <1>;
/* 1920*1080*4*2 = 0xFD2000 */
display_size_default = <1920 1080 1920 2160 32>;
/* 1920*1080*4*3 = 0x17BB000 */
display_size_default = <1920 1080 1920 3240 32>;
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
logo_addr = "0x7e400000";
logo_addr = "0x7f800000";
};
ge2d {
@@ -349,11 +350,7 @@
interrupt-names = "vsync";
};
ion_dev {
compatible = "amlogic, ion_dev";
status = "okay";
memory-region = <&ion_reserved>;
};
amvideocap {
compatible = "amlogic, amvideocap";

39
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
View File

@@ -39,6 +39,11 @@
serial4 = &uart_AO_B;
};
ion_dev {
compatible = "amlogic, ion_dev";
memory-region = <&ion_reserved>;
};
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x100000 0x0 0x3ff00000>;
@@ -64,18 +69,14 @@
// no-map;
//};
//pstore:aml_pstore {
// compatible = "amlogic, pstore";
// reg = <0x0 0x07300000 0x0 0x100000>;
// no-map;
//};
fb_reserved:linux,meson-fb {
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x1c00000>;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x3e400000 0x0 0x1c00000>;
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
};
//carveout_reserved:linux,carveout-reserve {
@@ -86,7 +87,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2000000>;
size = <0x0 0x7C00000>;
alignment = <0x0 0x400000>;
};
@@ -232,26 +233,26 @@
};
meson-fb {
compatible = "amlogic, meson-fb";
memory-region = <&fb_reserved>;
compatible = "amlogic, meson-txlx";
memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
mem_size = <0x00800000 0x01000000 0x00100000>;
mem_size = <0x00800000 0x01800000 0x00100000>;
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
/* 0:VPU free scale 1:OSD free scale 2:OSD super scale */
scale_mode = <1>;
/* 1920*1080*4*2 = 0xFD2000 */
display_size_default = <1920 1080 1920 2160 32>;
/* 1920*1080*4*3 = 0x17BB000 */
display_size_default = <1920 1080 1920 3240 32>;
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
logo_addr = "0x3e400000";
logo_addr = "0x3f800000";
};
ge2d {
compatible = "amlogic, ge2d";
compatible = "amlogic, ge2d-txlx";
dev_name = "ge2d";
status = "okay";
interrupts = <0 150 1>;
@@ -342,11 +343,7 @@
interrupt-names = "vsync";
};
ion_dev {
compatible = "amlogic, ion_dev";
status = "okay";
memory-region = <&ion_reserved>;
};
amvideocap {
compatible = "amlogic, amvideocap";

43
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
View File

@@ -39,6 +39,11 @@
serial4 = &uart_AO_B;
};
ion_dev {
compatible = "amlogic, ion_dev";
memory-region = <&ion_reserved>;
};
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x100000 0x0 0x7ff00000>;
@@ -49,6 +54,14 @@
#size-cells = <2>;
ranges;
/* global autoconfigured region for contiguous allocations */
ramoops@0x07400000 {
compatible = "ramoops";
reg = <0x0 0x07400000 0x0 0x00100000>;
record-size = <0x8000>;
console-size = <0x8000>;
ftrace-size = <0x0>;
pmsg-size = <0x8000>;
};
secmon_reserved:linux,secmon {
compatible = "shared-dma-pool";
reusable;
@@ -64,18 +77,14 @@
// no-map;
//};
//pstore:aml_pstore {
// compatible = "amlogic, pstore";
// reg = <0x0 0x07300000 0x0 0x100000>;
// no-map;
//};
fb_reserved:linux,meson-fb {
logo_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x1c00000>;
size = <0x0 0x800000>;
alignment = <0x0 0x400000>;
alloc-ranges = <0x0 0x7e400000 0x0 0x1c00000>;
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
};
//carveout_reserved:linux,carveout-reserve {
@@ -86,7 +95,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x5C00000>;
size = <0x0 0x7C00000>;
alignment = <0x0 0x400000>;
};
@@ -233,21 +242,21 @@
meson-fb {
compatible = "amlogic, meson-txlx";
memory-region = <&fb_reserved>;
memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
mem_size = <0x00800000 0x01000000 0x00100000>;
mem_size = <0x00800000 0x01800000 0x00100000>;
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
/* 0:VPU free scale 1:OSD free scale 2:OSD super scale */
scale_mode = <1>;
/* 1920*1080*4*2 = 0xFD2000 */
display_size_default = <1920 1080 1920 2160 32>;
/* 1920*1080*4*3 = 0x17BB000 */
display_size_default = <1920 1080 1920 3240 32>;
pxp_mode = <0>; /** 0:normal mode 1:pxp mode */
logo_addr = "0x7e400000";
logo_addr = "0x7f800000";
};
ge2d {
@@ -342,11 +351,7 @@
interrupt-names = "vsync";
};
ion_dev {
compatible = "amlogic, ion_dev";
status = "okay";
memory-region = <&ion_reserved>;
};
amvideocap {
compatible = "amlogic, amvideocap";