qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: display: support reserve memory for rkfb 

Some rockchip SDK like rk3399 Android 6.0 is still using rkfb in
kernel as display framework, in this case we need to:
- use a separate dtb in U-Boot which is drm display node;
- disable CONFIG_USING_KERNEL_DTB in U-Boot
- pass the reserve memory for kernel rkfb in U-Boot

Change-Id: I80df05d3cf15dce203c4397544b65f80fde1d22a
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2018-05-28 17:54:11 +08:00
parent 0313794bee
commit 694afdc865
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/drm/rockchip_display.c
View File

@ -1089,7 +1089,7 @@ void rockchip_display_fixup(void *blob)
const struct rockchip_connector *conn; const struct rockchip_connector *conn;
const struct rockchip_crtc *crtc; const struct rockchip_crtc *crtc;
struct display_state *s; struct display_state *s;
u32 offset; int offset;
const struct device_node *np; const struct device_node *np;
const char *path; const char *path;
@ -1101,6 +1101,12 @@ void rockchip_display_fixup(void *blob)
(u64)get_display_size()); (u64)get_display_size());
if (offset < 0) { if (offset < 0) {
printf("failed to add drm-loader-logo memory\n"); printf("failed to add drm-loader-logo memory\n");
/* Compatible with rkfb display, only need reserve memory */
offset = fdt_update_reserved_memory(blob, "rockchip,fb-logo",
(u64)memory_start,
(u64)get_display_size());
if (offset < 0)
printf("failed to add fb-loader-logo memory\n");
return; return;
} }