diff options
| author | wolfgar <stephan.rafin@laposte.net> | 2013-08-01 01:02:21 +0200 |
|---|---|---|
| committer | wolfgar <stephan.rafin@laposte.net> | 2013-08-01 01:45:27 +0200 |
| commit | c81dfc952ee31a43c1d0a7d993687985ef7cf9ec (patch) | |
| tree | ceb7246cf1654bd36255b3b0f68b29036316946b | |
| parent | 15bb848908719c50d97c50f17855a36e96327485 (diff) | |
| download | linux-c81dfc952ee31a43c1d0a7d993687985ef7cf9ec.tar.gz | |
Adapt video memory limit according to wandboard version
(cherry picked from commit 11a509c6d0958741af52fd85661c08975d1e271d)
| -rw-r--r-- | arch/arm/mach-mx6/board-wand.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c index 3ebda1086e69..56e1ba7b09d8 100644 --- a/arch/arm/mach-mx6/board-wand.c +++ b/arch/arm/mach-mx6/board-wand.c @@ -1149,7 +1149,12 @@ static void __init wand_reserve(void) { phys_addr_t phys; if (wand_gpu_pdata.reserved_mem_size) { - phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_2G); + if (cpu_is_mx6q()) + phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_2G); + else if (cpu_is_mx6dl()) + phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_1G); + else + phys = memblock_alloc_base(wand_gpu_pdata.reserved_mem_size, SZ_4K, SZ_512M); memblock_remove(phys, wand_gpu_pdata.reserved_mem_size); wand_gpu_pdata.reserved_mem_base = phys; } |