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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x3e000000";
+ logo_addr = "0x3f800000";
};
ge2d {
compatible = "amlogic, ge2d";
serial4 = &uart_AO_B;
};
- ion_dev {
- compatible = "amlogic, ion_dev";
- memory-region = <&ion_reserved>;
- };
-
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x0100000 0x0 0x3ff00000>;
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
-
- ion_reserved:linux,ion-dev {
+ fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x7000000>;
+ 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";
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&fb_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x1800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x3e000000";
+ logo_addr = "0x3dc00000";
};
ge2d {
compatible = "amlogic, ge2d";
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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7f800000";
};
ge2d {
compatible = "amlogic, ge2d";
serial4 = &uart_AO_B;
};
- ion_dev {
- compatible = "amlogic, ion_dev";
- memory-region = <&ion_reserved>;
- };
-
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
-
- ion_reserved:linux,ion-dev {
+ fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x7000000>;
+ size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
+ alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
/* vdin0 CMA pool */
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&fb_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x1800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7dc00000";
};
ge2d {
compatible = "amlogic, ge2d";
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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7f800000";
};
ge2d {
compatible = "amlogic, ge2d";
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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x3e000000";
+ logo_addr = "0x3f800000";
};
ge2d {
compatible = "amlogic, ge2d";
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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7f800000";
};
ge2d {
compatible = "amlogic, ge2d";
serial4 = &uart_AO_B;
};
- ion_dev {
- compatible = "amlogic, ion_dev";
- memory-region = <&ion_reserved>;
- };
-
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
-
- ion_reserved:linux,ion-dev {
+ fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x7000000>;
+ size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
+ alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
/* vdin0 CMA pool */
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&fb_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x1800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7dc00000";
};
ge2d {
compatible = "amlogic, ge2d";
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x2000000>;
+ size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
- alloc-ranges = <0x0 0x7e000000 0x0 0x2000000>;
+ alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7dc00000";
};
ge2d {
fb_reserved:linux,meson-fb {
compatible = "shared-dma-pool";
reusable;
- size = <0x0 0x2000000>;
+ size = <0x0 0x2400000>;
alignment = <0x0 0x400000>;
- alloc-ranges = <0x0 0x7e000000 0x0 0x2000000>;
+ alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
};
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7dc00000";
};
ge2d {
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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
+ mem_size = <0x00800000 0x01800000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x3f800000";
};
ge2d {
compatible = "amlogic, ge2d";
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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01851000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x7e000000";
+ logo_addr = "0x7f800000";
};
ge2d {
compatible = "amlogic, ge2d";
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;
meson-fb {
compatible = "amlogic, meson-fb";
+ memory-region = <&logo_reserved>;
dev_name = "meson-fb";
status = "okay";
interrupts = <0 3 1
0 89 1>;
interrupt-names = "viu-vsync", "rdma";
- mem_size = <0x006AF000 0x01851000 0x00100000>;
- /* uboot logo,fb0/fb1 memory size */
+ mem_size = <0x00800000 0x01851000 0x00100000>;
+ /* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
display_mode_default = "1080p60hz";
scale_mode = <1>;
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
display_size_default = <1920 1080 1920 3240 32>;
/*1920*1080*4*3 = 0x17BB000*/
- logo_addr = "0x3e000000";
+ logo_addr = "0x3f800000";
};
ge2d {
compatible = "amlogic, ge2d";
var = &info->var;
/* read cma/fb-reserved memory first */
if ((b_reserved_mem == true) &&
- (fb_memsize[0] + fb_memsize[1] +
- fb_memsize[2]) <= size) {
+ ((fb_memsize[0] + fb_memsize[1] +
+ fb_memsize[2] <= size) &&
+ (fb_memsize[fb_index + 1] > 0))) {
fb_rmem_size[fb_index] = fb_memsize[fb_index + 1];
if (fb_index == DEV_OSD0)
fb_rmem_paddr[fb_index] = base +
fb_rmem.base = rmem->base;
fb_rmem.size = rmem->size;
rmem->ops = &rmem_fb_ops;
- osd_log_dbg("Reserved memory: created fb at 0x%p, size %ld MiB\n",
+ osd_log_info("Reserved memory: created fb at 0x%p, size %ld MiB\n",
(void *)rmem->base, (unsigned long)rmem->size / SZ_1M);
return 0;
}