From 1d26e6c536200fb6fdcda026f54b9b5721e49ef5 Mon Sep 17 00:00:00 2001 From: Joy Cho Date: Wed, 26 Feb 2020 12:18:19 +0900 Subject: [PATCH] display: Fix abnormal logo loading issue When loading logo.bmp format in rockchip_display_fixup, it occurs an wrong detection of initrd format. Change-Id: I3ce9dc6ed4c16888692a2c3a786cf2d563b0aa31 --- drivers/video/drm/rockchip_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/video/drm/rockchip_display.c b/drivers/video/drm/rockchip_display.c index 326ac12d2a0..7163f453502 100644 --- a/drivers/video/drm/rockchip_display.c +++ b/drivers/video/drm/rockchip_display.c @@ -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; }