From 9d01b2a1eabaa797333dc957c1dd6f5ccadfc183 Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Thu, 2 May 2013 18:29:30 -0700 Subject: [PATCH] snow: Set vbe mode info to valid later in the boot process This sets the vbe mode to valid later in the boot process, after cbmem resources have been allocated during displayport init. BRANCH=none BUG=none TEST=booted on Snow using depthcharge in dev mode Signed-off-by: David Hendricks Change-Id: I5ea675de817a2cf5695ef0473550023c72dd04c7 Reviewed-on: https://gerrit.chromium.org/gerrit/50013 Commit-Queue: David Hendricks Reviewed-by: David Hendricks Tested-by: David Hendricks --- src/mainboard/google/snow/ramstage.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/snow/ramstage.c b/src/mainboard/google/snow/ramstage.c index 3c639be3ec..6921c5ef8e 100644 --- a/src/mainboard/google/snow/ramstage.c +++ b/src/mainboard/google/snow/ramstage.c @@ -53,7 +53,6 @@ static struct edid snow_edid = { void hardwaremain(int boot_complete); void main(void) { - void *graphics_address; console_init(); printk(BIOS_INFO, "hello from ramstage; now with deluxe exception handling.\n"); @@ -87,8 +86,6 @@ void main(void) clock_set_i2s_clk_prescaler(epll_hz, sample_rate * lr_frame_size); power_enable_xclkout(); - graphics_address = cbmem_find(CBMEM_ID_CONSOLE); - set_vbe_mode_info_valid(&snow_edid, (uintptr_t)graphics_address); hardwaremain(0); } @@ -228,6 +225,7 @@ static void mainboard_init(device_t dev) .base = (struct exynos5_dp *)EXYNOS5250_DP1_BASE, .video_info = &snow_dp_video_info, }; + void *fb_addr; i2c_init(TPS69050_BUS, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(7, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); @@ -240,6 +238,9 @@ static void mainboard_init(device_t dev) /* Disable USB3.0 PLL to save 250mW of power */ disable_usb30_pll(); + fb_addr = cbmem_find(CBMEM_ID_CONSOLE); + set_vbe_mode_info_valid(&snow_edid, (uintptr_t)(fb_addr) + 64*KiB); + snow_lcd_vdd(); do { udelay(50);