ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 15 insertions, 18 deletions

diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index 3b1237ad85ed..f6fdc2085f3e 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -25,7 +25,7 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/seq_file.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/completion.h>
 #include <linux/debugfs.h>
 #include <linux/jiffies.h>
@@ -525,10 +525,8 @@ early_param("vram", omap_vram_early_vram);
  * Called from map_io. We need to call to this early enough so that we
  * can reserve the fixed SDRAM regions before VM could get hold of them.
  */
-void __init omap_vram_reserve_sdram(void)
+void __init omap_vram_reserve_sdram_memblock(void)
 {
-        struct bootmem_data     *bdata;
-        unsigned long           sdram_start, sdram_size;
         u32 paddr;
         u32 size = 0;
 
@@ -555,29 +553,28 @@ void __init omap_vram_reserve_sdram(void)
 
         size = PAGE_ALIGN(size);
 
-        bdata = NODE_DATA(0)->bdata;
-        sdram_start = bdata->node_min_pfn << PAGE_SHIFT;
-        sdram_size = (bdata->node_low_pfn << PAGE_SHIFT) - sdram_start;
-
         if (paddr) {
-                if ((paddr & ~PAGE_MASK) || paddr < sdram_start ||
-                                paddr + size > sdram_start + sdram_size) {
+                struct memblock_property res;
+
+                res.base = paddr;
+                res.size = size;
+                if ((paddr & ~PAGE_MASK) || memblock_find(&res) ||
+                    res.base != paddr || res.size != size) {
                         pr_err("Illegal SDRAM region for VRAM\n");
                         return;
                 }
 
-                if (reserve_bootmem(paddr, size, BOOTMEM_EXCLUSIVE) < 0) {
-                        pr_err("FB: failed to reserve VRAM\n");
+                if (memblock_is_region_reserved(paddr, size)) {
+                        pr_err("FB: failed to reserve VRAM - busy\n");
                         return;
                 }
-        } else {
-                if (size > sdram_size) {
-                        pr_err("Illegal SDRAM size for VRAM\n");
+
+                if (memblock_reserve(paddr, size) < 0) {
+                        pr_err("FB: failed to reserve VRAM - no memory\n");
                         return;
                 }
-
-                paddr = virt_to_phys(alloc_bootmem_pages(size));
-                BUG_ON(paddr & ~PAGE_MASK);
+        } else {
+                paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT);
         }
 
         omap_vram_add_region(paddr, size);