Skip to content

Commit

Permalink
display: Fix abnormal logo loading issue
Browse files Browse the repository at this point in the history
When loading logo.bmp format in rockchip_display_fixup,
it occurs an wrong detection of initrd format.

Change-Id: I3ce9dc6ed4c16888692a2c3a786cf2d563b0aa31
  • Loading branch information
Joy Cho committed Feb 28, 2020
1 parent 5fa7c15 commit 1d26e6c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/video/drm/rockchip_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1427,10 +1427,12 @@ void rockchip_display_fixup(void *blob)
{
struct display_state *s;
int offset = 0;
unsigned long bmp_mem;

if (fdt_node_offset_by_compatible(blob, 0, "rockchip,drm-logo") >= 0) {
list_for_each_entry(s, &rockchip_display_list, head) {
if (lcd_show_logo())
bmp_mem = get_drm_memory() + DRM_ROCKCHIP_FB_SIZE;
if (show_bmp(bmp_mem))
return;
}

Expand Down

0 comments on commit 1d26e6c

Please sign in to comment.