[ARM] tegra: stingray: fix HDMI support

This moves the nvmap carveout to make room for the HDMI framebuffer
and hard codes the buffer's location.

Change-Id: I06609ce127d01fba66ddbef6ee4a25ff2ad181c7
Signed-off-by: Erik Gilling <konkers@android.com>

diff --git a/arch/arm/mach-tegra/board-stingray-panel.c b/arch/arm/mach-tegra/board-stingray-panel.c
index 5650bed228f957640ed8b97ff2e28ec0e803cb92..fcbb643d65799f1a4c554a462bed6cf73be51764 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray-panel.c
+++ b/arch/arm/mach-tegra/board-stingray-panel.c
@@ -20,7 +20,6 @@
 #include <linux/resource.h>
 #include <linux/leds-lp8550.h>
 #include <linux/platform_device.h>
-#include <linux/bootmem.h>
 #include <linux/earlysuspend.h>
 #include <asm/mach-types.h>
 #include <mach/irqs.h>
@@ -75,6 +74,8 @@ static struct resource stingray_disp2_resources[] = {
        },
        {
                .name   = "fbmem",
+               .start  = 0x1c600000,
+               .end    = 0x1c600000 + 0x1000000 - 1,
                .flags  = IORESOURCE_MEM,
        },
        {
@@ -330,17 +331,6 @@ static void stingray_panel_late_resume(struct early_suspend *h)
 }
 #endif
 
-#define FB_MEM_SIZE    (1920 * 1080 * 4 * 2)
-void __init stingray_fb_alloc(void)
-{
-#if 0
-       u32 *fb_mem = alloc_bootmem(FB_MEM_SIZE);
-
-       stingray_disp2_resources[2].start = virt_to_phys(fb_mem);
-       stingray_disp2_resources[2].end = virt_to_phys(fb_mem) + FB_MEM_SIZE - 1;
-#endif
-}
-
 static struct regulator *stingray_csi_reg;
 
 int __init stingray_panel_init(void)
@@ -377,7 +367,7 @@ int __init stingray_panel_init(void)
        register_early_suspend(&stingray_panel_early_suspender);
 #endif
 
-       return nvhost_device_register(&stingray_disp1_device);
-//     return  nvhost_device_register(&stingray_disp2_device);
+       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 5f56ca511043fab7c3fd85071fe03d5b55f53c58..1d4712c41ea17de11953a46175a5400e048dfc9d 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray.c
+++ b/arch/arm/mach-tegra/board-stingray.c
@@ -565,8 +565,8 @@ static struct nvmap_platform_carveout stingray_carveouts[] = {
        [1] = {
                .name           = "generic-0",
                .usage_mask     = NVMAP_HEAP_CARVEOUT_GENERIC,
-               .base           = 0x1c600000, /* 1M aligned above disp1 fbmem */
-               .size           = SZ_64M - 0x600000,
+               .base           = 0x18000000,
+               .size           = SZ_64M,
                .buddy_size     = SZ_32K,
        },
 };
@@ -1026,7 +1026,6 @@ static void __init tegra_stingray_init(void)
 void __init stingray_map_io(void)
 {
        tegra_map_common_io();
-       stingray_fb_alloc();
 }
 
 void __init stingray_reserve(void)