gpu: nvgpu: Support multiple types of allocators

Support multiple types of allocation backends. Currently there is
only one allocator implementation available: a buddy allocator.
Buddy allocators have certain limitations though. For one the
allocator requires metadata to be allocated from the kernel's
system memory. This causes a given buddy allocation to potentially
sleep on a kmalloc() call.

This patch has been created so that a new backend can be created
which will avoid any dynamic system memory management routines
from being called.

Bug 1781897

Change-Id: I98d6c8402c049942f13fee69c6901a166f177f65
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1172115
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
index 0571ca1f..8144ec6e 100644
--- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
@@ -279,16 +279,17 @@ static int gk20a_as_ioctl_get_va_regions(
 
         for (i = 0; i < write_entries; ++i) {
                 struct nvgpu_as_va_region region;
-                struct gk20a_allocator *vma = vm->fixed.init ?
+                struct gk20a_allocator *vma =
+                        gk20a_alloc_initialized(&vm->fixed) ?
                         &vm->fixed : &vm->vma[i];
 
                 memset(&region, 0, sizeof(struct nvgpu_as_va_region));
 
                 region.page_size = vm->gmmu_page_sizes[i];
-                region.offset = vma->base;
+                region.offset = gk20a_alloc_base(vma);
                 /* No __aeabi_uldivmod() on some platforms... */
-                region.pages = (vma->end - vma->start) >>
-                        ilog2(region.page_size);
+                region.pages = (gk20a_alloc_end(vma) -
+                        gk20a_alloc_base(vma)) >> ilog2(region.page_size);
 
                 if (copy_to_user(user_region_ptr + i, &region, sizeof(region)))
                         return -EFAULT;