[ARM] tegra: stingray: Move framebuffer, enable protected aperture

Change-Id: I5aa3cb2e3d735d2c5dede35ec8870f948cf176c5
Signed-off-by: Colin Cross <ccross@android.com>

diff --git a/arch/arm/mach-tegra/board-stingray-panel.c b/arch/arm/mach-tegra/board-stingray-panel.c
index d22f1ea97ce845e575a7384cbb970798ca503dea..29a6dd36eea97838fda1d67e67535cda6cbd33c0 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray-panel.c
+++ b/arch/arm/mach-tegra/board-stingray-panel.c
@@ -356,6 +356,9 @@ int __init stingray_panel_init(void)
        res->start = tegra_fb2_start;
        res->end = tegra_fb2_start + tegra_fb2_size - 1;
 
+       tegra_move_framebuffer(tegra_fb_start, tegra_bootloader_fb_start,
+               min(tegra_fb_size, tegra_bootloader_fb_size));
+
        nvhost_device_register(&stingray_disp1_device);
        return  nvhost_device_register(&stingray_disp2_device);
 }

diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c
index 18cf15bf6ababa4d204b05d996bf135b6b65df26..ccb321f4b575c86eb396133ec9371cddc2aee943 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray.c
+++ b/arch/arm/mach-tegra/board-stingray.c
@@ -1026,6 +1026,14 @@ static void __init tegra_stingray_init(void)
        stingray_usb_init();
 }
 
+int __init stingray_protected_aperture_init(void)
+{
+       tegra_protected_aperture_init(tegra_grhost_aperture);
+       memblock_free(tegra_bootloader_fb_start, tegra_bootloader_fb_size);
+       return 0;
+}
+late_initcall(stingray_protected_aperture_init);
+
 void __init stingray_map_io(void)
 {
        tegra_map_common_io();