From: Colin Cross <ccross@android.com>
Date: Tue, 19 Oct 2010 23:18:22 +0000 (-0700)
Subject: [ARM] tegra: stingray: Move framebuffer, enable protected aperture
X-Git-Tag: firefly_0821_release~9834^2~422
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da044e86ebc1c5ce615d21e6f914d76becb5d63a;p=firefly-linux-kernel-4.4.55.git

[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 d22f1ea97ce8..29a6dd36eea9 100644
--- 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 18cf15bf6aba..ccb321f4b575 100644
--- 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();