From: Stephen Warren Date: Tue, 29 Jan 2013 16:37:38 +0000 (+0000) Subject: lcd: calculate line_length after lcd_ctrl_init() X-Git-Tag: v2013.04-rc2~14^2~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d330719;p=oweals%2Fu-boot.git lcd: calculate line_length after lcd_ctrl_init() When an LCD driver is actually driving a regular external display, e.g. an HDMI monitor, the display resolution might not be known until the display controller has initialized, i.e. during lcd_ctrl_init(). However, lcd.c calculates lcd_line_length before calling this function, thus relying on a hard-coded resolution in struct panel_info. Instead, defer this calculation until after lcd_ctrl_init() has had the chance to dynamically determine the resolution. This needs to happen before lcd_clear(), since the value is used there. grep indicates that no code outside lcd.c uses this lcd_line_length; in particular, no lcd_ctrl_init() implementations read it. Signed-off-by: Stephen Warren Acked-by: Anatolij Gustschin --- diff --git a/common/lcd.c b/common/lcd.c index 590bbb9301..77914adbce 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -386,8 +386,6 @@ int drv_lcd_init (void) lcd_base = (void *)(gd->fb_base); - lcd_get_size(&lcd_line_length); - lcd_init(lcd_base); /* LCD initialization */ /* Device initialization */ @@ -470,6 +468,8 @@ static int lcd_init(void *lcdbase) debug("[LCD] Initializing LCD frambuffer at %p\n", lcdbase); lcd_ctrl_init(lcdbase); + lcd_get_size(&lcd_line_length); + lcd_line_length = (panel_info.vl_col * NBITS(panel_info.vl_bpix)) / 8; lcd_is_enabled = 1; lcd_clear(); lcd_enable ();