arm: tegra: display: handle fbmem2 cmdline parameter

Parse and handle fbmem2 cmdline parameter.

bug 1175957

Change-Id: I0933825371bf13782e9f4364a4dba078929ae836
Signed-off-by: Jong Kim <jongk@nvidia.com>
Reviewed-on: http://git-master/r/170662
Reviewed-on: http://git-master/r/172868
(cherry picked from commit 7959de63b20530d1c13e1fca2f01ad2cb614ded9)
Reviewed-on: http://git-master/r/173773
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>

diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 602147b5220570d275126844cd38ed47ba6c9248..743ae576efe38272d1148eb11af7b3ccdf621aed 100644 (file)
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -127,6 +127,8 @@ static inline void __init tegra_ram_console_debug_reserve(unsigned long ram_cons
 
 extern unsigned long tegra_bootloader_fb_start;
 extern unsigned long tegra_bootloader_fb_size;
+extern unsigned long tegra_bootloader_fb2_start;
+extern unsigned long tegra_bootloader_fb2_size;
 extern unsigned long tegra_fb_start;
 extern unsigned long tegra_fb_size;
 extern unsigned long tegra_fb2_start;

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index ec0783f1fe8e59deaa8c99438634fd1b09b1b992..6f0243a003def7e65eb0dc6893228014bb65f627 100644 (file)
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -104,6 +104,8 @@ unsigned long tegra_avp_kernel_start;
 unsigned long tegra_avp_kernel_size;
 unsigned long tegra_bootloader_fb_start;
 unsigned long tegra_bootloader_fb_size;
+unsigned long tegra_bootloader_fb2_start;
+unsigned long tegra_bootloader_fb2_size;
 unsigned long tegra_fb_start;
 unsigned long tegra_fb_size;
 unsigned long tegra_fb2_start;
@@ -786,6 +788,21 @@ static int __init tegra_bootloader_fb_arg(char *options)
 }
 early_param("tegra_fbmem", tegra_bootloader_fb_arg);
 
+static int __init tegra_bootloader_fb2_arg(char *options)
+{
+       char *p = options;
+
+       tegra_bootloader_fb2_size = memparse(p, &p);
+       if (*p == '@')
+               tegra_bootloader_fb2_start = memparse(p+1, &p);
+
+       pr_info("Found tegra_fbmem2: %08lx@%08lx\n",
+               tegra_bootloader_fb2_size, tegra_bootloader_fb2_start);
+
+       return 0;
+}
+early_param("tegra_fbmem2", tegra_bootloader_fb2_arg);
+
 static int __init tegra_sku_override(char *id)
 {
        char *p = id;
@@ -1352,9 +1369,23 @@ void __init tegra_reserve(unsigned long carveout_size, unsigned long fb_size,
                }
        }
 
+       if (tegra_bootloader_fb2_size) {
+               tegra_bootloader_fb2_size =
+                               PAGE_ALIGN(tegra_bootloader_fb2_size);
+               if (memblock_reserve(tegra_bootloader_fb2_start,
+                               tegra_bootloader_fb2_size)) {
+                       pr_err("Failed to reserve bootloader fb2 %08lx@%08lx\n",
+                               tegra_bootloader_fb2_size,
+                               tegra_bootloader_fb2_start);
+                       tegra_bootloader_fb2_start = 0;
+                       tegra_bootloader_fb2_size = 0;
+               }
+       }
+
        pr_info("Tegra reserved memory:\n"
                "LP0:                    %08lx - %08lx\n"
                "Bootloader framebuffer: %08lx - %08lx\n"
+               "Bootloader framebuffer2: %08lx - %08lx\n"
                "Framebuffer:            %08lx - %08lx\n"
                "2nd Framebuffer:        %08lx - %08lx\n"
                "Carveout:               %08lx - %08lx\n"
@@ -1367,8 +1398,10 @@ void __init tegra_reserve(unsigned long carveout_size, unsigned long fb_size,
                        tegra_lp0_vec_start + tegra_lp0_vec_size - 1 : 0,
                tegra_bootloader_fb_start,
                tegra_bootloader_fb_size ?
-                       tegra_bootloader_fb_start + tegra_bootloader_fb_size - 1
-                       : 0,
+                tegra_bootloader_fb_start + tegra_bootloader_fb_size - 1 : 0,
+               tegra_bootloader_fb2_start,
+               tegra_bootloader_fb2_size ?
+                tegra_bootloader_fb2_start + tegra_bootloader_fb2_size - 1 : 0,
                tegra_fb_start,
                tegra_fb_size ?
                        tegra_fb_start + tegra_fb_size - 1 : 0,
@@ -1450,6 +1483,10 @@ void __init tegra_release_bootloader_fb(void)
                if (memblock_free(tegra_bootloader_fb_start,
                                                tegra_bootloader_fb_size))
                        pr_err("Failed to free bootloader fb.\n");
+       if (tegra_bootloader_fb2_size)
+               if (memblock_free(tegra_bootloader_fb2_start,
+                                               tegra_bootloader_fb2_size))
+                       pr_err("Failed to free bootloader fb2.\n");
 }
 
 #if defined(CONFIG_TEGRA_BASEBAND)