gpu: ion: Modify reserve function for carveouts with no start address

This patch allows you to specify a heap that requires carveout memory
but that doesn't specify a start address.  Memblock_alloc will be called
to find a location for these heaps.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index e0eb2de736953de2fa2f2d406f1dfa1e314a5150..3167c1d46169f7ae4aa9157840d52713d32d39d8 100644 (file)
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1343,16 +1343,35 @@ void ion_device_destroy(struct ion_device *dev)
 
 void __init ion_reserve(struct ion_platform_data *data)
 {
-       int i, ret;
+       int i;
 
        for (i = 0; i < data->nr; i++) {
                if (data->heaps[i].size == 0)
                        continue;
-               ret = memblock_reserve(data->heaps[i].base,
-                                      data->heaps[i].size);
-               if (ret)
-                       pr_err("memblock reserve of %x@%lx failed\n",
-                              data->heaps[i].size,
-                              data->heaps[i].base);
+
+               if (data->heaps[i].base == 0) {
+                       phys_addr_t paddr;
+                       paddr = memblock_alloc_base(data->heaps[i].size,
+                                                   data->heaps[i].align,
+                                                   MEMBLOCK_ALLOC_ANYWHERE);
+                       if (!paddr) {
+                               pr_err("%s: error allocating memblock for "
+                                      "heap %d\n",
+                                       __func__, i);
+                               continue;
+                       }
+                       data->heaps[i].base = paddr;
+               } else {
+                       int ret = memblock_reserve(data->heaps[i].base,
+                                              data->heaps[i].size);
+                       if (ret)
+                               pr_err("memblock reserve of %x@%lx failed\n",
+                                      data->heaps[i].size,
+                                      data->heaps[i].base);
+               }
+               pr_info("%s: %s reserved base %lx size %d\n", __func__,
+                       data->heaps[i].name,
+                       data->heaps[i].base,
+                       data->heaps[i].size);
        }
 }