aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@nokia.com>2010-11-10 11:45:19 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-11-10 20:51:13 +0900
commit88abf44d3d8d4fefcbf3d57584d471e38cb51627 (patch)
treeb43468aec564c391415252636995e08ad3e45f0c
parent108409a8a4e325db38f27258da68d7207a0ad433 (diff)
downloadmrst-s0i3-test-88abf44d3d8d4fefcbf3d57584d471e38cb51627.tar.gz
mrst-s0i3-test-88abf44d3d8d4fefcbf3d57584d471e38cb51627.tar.xz
mrst-s0i3-test-88abf44d3d8d4fefcbf3d57584d471e38cb51627.zip
OMAP: VRAM: Fix boot-time memory allocation
Use memblock_free() and memblock_remove() to remove the allocated or reserved VRAM area from normal kernel memory. This is a slightly modified version of patches from Felipe Contreras and Namhyung Kim. Reported-by: Felipe Contreras <felipe.contreras@gmail.com> Reported-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/omap2/vram.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index bb5ee0663e6..2fd7e5271be 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -576,9 +576,12 @@ void __init omap_vram_reserve_sdram_memblock(void)
return;
}
} else {
- paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT);
+ paddr = memblock_alloc(size, PAGE_SIZE);
}
+ memblock_free(paddr, size);
+ memblock_remove(paddr, size);
+
omap_vram_add_region(paddr, size);
pr_info("Reserving %u bytes SDRAM for VRAM\n", size);