summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/board-aruba-panel.c4
-rw-r--r--arch/arm/mach-tegra/board-aruba.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-aruba-panel.c b/arch/arm/mach-tegra/board-aruba-panel.c
index 5db69f66a13a..deb2a089560a 100644
--- a/arch/arm/mach-tegra/board-aruba-panel.c
+++ b/arch/arm/mach-tegra/board-aruba-panel.c
@@ -228,6 +228,10 @@ int __init aruba_panel_init(void)
res->start = tegra_fb_start;
res->end = tegra_fb_start + tegra_fb_size - 1;
+ /* Copy the bootloader fb to the fb. */
+ tegra_move_framebuffer(tegra_fb_start, tegra_bootloader_fb_start,
+ min(tegra_fb_size, tegra_bootloader_fb_size));
+
if (!err)
err = nvhost_device_register(&aruba_disp1_device);
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c
index 0f0befe0c6d0..df7d4c65598f 100644
--- a/arch/arm/mach-tegra/board-aruba.c
+++ b/arch/arm/mach-tegra/board-aruba.c
@@ -493,6 +493,7 @@ static void __init tegra_aruba_init(void)
aruba_sensors_init();
aruba_bt_rfkill();
aruba_sata_init();
+ tegra_release_bootloader_fb();
}
static void __init tegra_aruba_reserve(void)