From: Richard Zhao Date: Thu, 14 Jul 2011 02:23:05 +0000 (+0800) Subject: ENGR00153092 ARM: mx6q_sabreauto: restrict gpu reserved memory addr < 2G X-Git-Tag: v3.0.35-fsl_4.1.0~2422 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c78037f688cbdb26e67e11c0a5248e01801f2eac;p=karo-tx-linux.git ENGR00153092 ARM: mx6q_sabreauto: restrict gpu reserved memory addr < 2G gc2000 driver 4.3 can not support reserved memory addr > 2G Signed-off-by: Richard Zhao --- diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 6c09b52940ee..e58a9f844f81 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -534,7 +534,7 @@ static void __init mx6q_reserve(void) phys_addr_t phys; if (imx6q_gc2000_pdata.reserved_mem_size) { - phys = memblock_alloc(imx6q_gc2000_pdata.reserved_mem_size, SZ_4K); + phys = memblock_alloc_base(imx6q_gc2000_pdata.reserved_mem_size, SZ_4K, SZ_2G); memblock_free(phys, imx6q_gc2000_pdata.reserved_mem_size); memblock_remove(phys, imx6q_gc2000_pdata.reserved_mem_size); imx6q_gc2000_pdata.reserved_mem_base = phys;