1 files changed, 1 insertions, 15 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 3b57e781..e1942cbd 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -79,13 +79,6 @@ static u64 __nvgpu_gmmu_map(struct vm_gk20a *vm,
         if (!sgt)
                 return -ENOMEM;
 
-        /*
-         * If the GPU is IO coherent and the DMA API is giving us IO coherent
-         * CPU mappings then we gotta make sure we use the IO coherent aperture.
-         */
-        if (nvgpu_is_enabled(g, NVGPU_USE_COHERENT_SYSMEM))
-                flags |= NVGPU_VM_MAP_IO_COHERENT;
-
         nvgpu_mutex_acquire(&vm->update_gmmu_lock);
         vaddr = g->ops.mm.gmmu_map(vm, addr,
                                    sgt,    /* sg list */
@@ -634,7 +627,7 @@ static int __nvgpu_gmmu_update_page_table(struct vm_gk20a *vm,
                    page_size >> 10,
                    nvgpu_gmmu_perm_str(attrs->rw_flag),
                    attrs->kind_v,
-                   nvgpu_aperture_str(g, attrs->aperture),
+                   nvgpu_aperture_str(attrs->aperture),
                    attrs->cacheable ? 'C' : '-',
                    attrs->sparse    ? 'S' : '-',
                    attrs->priv      ? 'P' : '-',
@@ -712,13 +705,6 @@ u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm,
         attrs.l3_alloc = (bool)(flags & NVGPU_VM_MAP_L3_ALLOC);
 
         /*
-         * Handle the IO coherency aperture: make sure the .aperture field is
-         * correct based on the IO coherency flag.
-         */
-        if (attrs.coherent && attrs.aperture == APERTURE_SYSMEM)
-                attrs.aperture = __APERTURE_SYSMEM_COH;
-
-        /*
          * Only allocate a new GPU VA range if we haven't already been passed a
          * GPU VA range. This facilitates fixed mappings.
          */