Merge branch 'for-v2013.04'

[u-boot.git] / common / lcd.c

diff --git a/common/lcd.c b/common/lcd.c
index 195f1de617c07a508f579c70b5df57e53e013562..b98eea669692a977c5a7684e81b56e5328d8111b 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -411,8 +411,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 */
@@ -495,6 +493,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();