1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 2b579bdd..1be87c85 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -637,6 +637,8 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm,
                                           struct nvgpu_gmmu_attrs *attrs)
 {
         struct gk20a *g = gk20a_from_vm(vm);
+        struct nvgpu_page_alloc *alloc;
+        u64 phys_addr = 0;
         u32 page_size;
         int err;
 
@@ -662,6 +664,15 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm,
                 return err;
         }
 
+        if (sgt) {
+                if (attrs->aperture == APERTURE_VIDMEM) {
+                        alloc = get_vidmem_page_alloc(sgt->sgl);
+
+                        phys_addr = alloc->base;
+                } else
+                        phys_addr = g->ops.mm.get_iova_addr(g, sgt->sgl, 0);
+        }
+
         __gmmu_dbg(g, attrs,
                    "vm=%s "
                    "%-5s GPU virt %#-12llx +%#-9llx    phys %#-12llx "
@@ -671,7 +682,7 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm,
                    sgt ? "MAP" : "UNMAP",
                    virt_addr,
                    length,
-                   sgt ? g->ops.mm.get_iova_addr(g, sgt->sgl, 0) : 0ULL,
+                   phys_addr,
                    space_to_skip,
                    page_size >> 10,
                    nvgpu_gmmu_perm_str(attrs->rw_flag),