ENGR00223797-8 MX6 SabreSD:Reserve primary fbmem with base addr

This patch supports to reserve primary framebuffer's memory
separately if its base address is set in kernel command line
with 'fb0base=' option. To support this feature, note that
'fbmem=' is also required to be set to specify the size of the
memory reserved for the primary framebuffer. This patch is for
Android kernel only.

Signed-off-by: Liu Ying <Ying.Liu@freescale.com>

1 files changed, 31 insertions, 10 deletions

diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
index c411b5f4d1bf..f0e17bc7702c 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
@@ -1684,6 +1684,14 @@ static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags,
 					pdata_fb[i++].res_size[0] = memparse(str, &str);
 				}
 			}
+			/* Primary framebuffer base address */
+			str = t->u.cmdline.cmdline;
+			str = strstr(str, "fb0base=");
+			if (str != NULL) {
+				str += 8;
+				pdata_fb[0].res_base[0] =
+						simple_strtol(str, &str, 16);
+			}
 			break;
 		}
 	}
@@ -1994,7 +2002,29 @@ static struct sys_timer mx6_sabresd_timer = {
 static void __init mx6q_sabresd_reserve(void)
 {
 	phys_addr_t phys;
-	int i;
+	int i, fb0_reserved = 0, fb_array_size;
+
+	/*
+	 * Reserve primary framebuffer memory if its base address
+	 * is set by kernel command line.
+	 */
+	fb_array_size = ARRAY_SIZE(sabresd_fb_data);
+	if (fb_array_size > 0 && sabresd_fb_data[0].res_base[0] &&
+	    sabresd_fb_data[0].res_size[0]) {
+		memblock_reserve(sabresd_fb_data[0].res_base[0],
+				 sabresd_fb_data[0].res_size[0]);
+		memblock_remove(sabresd_fb_data[0].res_base[0],
+				sabresd_fb_data[0].res_size[0]);
+		fb0_reserved = 1;
+	}
+	for (i = fb0_reserved; i < fb_array_size; i++)
+		if (sabresd_fb_data[i].res_size[0]) {
+			/* Reserve for other background buffer. */
+			phys = memblock_alloc(sabresd_fb_data[i].res_size[0],
+						SZ_4K);
+			memblock_remove(phys, sabresd_fb_data[i].res_size[0]);
+			sabresd_fb_data[i].res_base[0] = phys;
+		}
 
 #if defined(CONFIG_MXC_GPU_VIV) || defined(CONFIG_MXC_GPU_VIV_MODULE)
 	if (imx6q_gpu_pdata.reserved_mem_size) {
@@ -2012,15 +2042,6 @@ static void __init mx6q_sabresd_reserve(void)
 		imx_ion_data.heaps[0].base = phys;
 	}
 #endif
-
-	for (i = 0; i < ARRAY_SIZE(sabresd_fb_data); i++)
-		if (sabresd_fb_data[i].res_size[0]) {
-			/* reserve for background buffer */
-			phys = memblock_alloc(sabresd_fb_data[i].res_size[0],
-						SZ_4K);
-			memblock_remove(phys, sabresd_fb_data[i].res_size[0]);
-			sabresd_fb_data[i].res_base[0] = phys;
-		}
 }
 
 /*