Revert "Revert "gpu: nvgpu: New allocator for VA space""

This reverts commit 7eb42bc239dbd207208ff491c3fb65c3d83274d8.

The original commit was actually fine.

Change-Id: I564ce6530ac73fcfad17dcec9c53f0353b4f02d4
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/743300
(cherry picked from commit e99aa2485f8992eabe3556f3ebcb57bdc8ad91ff)
Reviewed-on: http://git-master/r/743301
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
index 63569008..eb18fa65 100644
--- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
@@ -199,21 +199,14 @@ static int gk20a_as_ioctl_get_va_regions(
 
         for (i = 0; i < write_entries; ++i) {
                 struct nvgpu_as_va_region region;
-                u32 base, limit;
 
                 memset(&region, 0, sizeof(struct nvgpu_as_va_region));
 
-                if (!vm->vma[i].constraint.enable) {
-                        base = vm->vma[i].base;
-                        limit = vm->vma[i].limit;
-                } else {
-                        base = vm->vma[i].constraint.base;
-                        limit = vm->vma[i].constraint.limit;
-                }
-
                 region.page_size = vm->gmmu_page_sizes[i];
-                region.offset = (u64)base * region.page_size;
-                region.pages = limit - base; /* NOTE: limit is exclusive */
+                region.offset = vm->vma[i].base;
+                /* No __aeabi_uldivmod() on some platforms... */
+                region.pages = (vm->vma[i].end - vm->vma[i].start) >>
+                        ilog2(region.page_size);
 
                 if (copy_to_user(user_region_ptr + i, &region, sizeof(region)))
                         return -EFAULT;