2 files changed, 1 insertions, 61 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 41343718..ffac324c 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.
          */
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index 78a57b4e..73b6b2a7 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -28,52 +28,6 @@
 
 #include "gk20a/gk20a.h"
 
-/*
- * Make sure to use the right coherency aperture if you use this function! This
- * will not add any checks. If you want to simply use the default coherency then
- * use nvgpu_aperture_mask().
- */
-u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture,
-                          u32 sysmem_mask, u32 sysmem_coh_mask, u32 vidmem_mask)
-{
-        /*
-         * Some iGPUs treat sysmem (i.e SoC DRAM) as vidmem. In these cases the
-         * "sysmem" aperture should really be translated to VIDMEM.
-         */
-        if (!nvgpu_is_enabled(g, NVGPU_MM_HONORS_APERTURE))
-                aperture = APERTURE_VIDMEM;
-
-        switch (aperture) {
-        case __APERTURE_SYSMEM_COH:
-                return sysmem_coh_mask;
-        case APERTURE_SYSMEM:
-                return sysmem_mask;
-        case APERTURE_VIDMEM:
-                return vidmem_mask;
-        case APERTURE_INVALID:
-                WARN_ON("Bad aperture");
-        }
-        return 0;
-}
-
-u32 nvgpu_aperture_mask(struct gk20a *g, struct nvgpu_mem *mem,
-                        u32 sysmem_mask, u32 sysmem_coh_mask, u32 vidmem_mask)
-{
-        enum nvgpu_aperture ap = mem->aperture;
-
-        /*
-         * Handle the coherent aperture: ideally most of the driver is not
-         * aware of the difference between coherent and non-coherent sysmem so
-         * we add this translation step here.
-         */
-        if (nvgpu_is_enabled(g, NVGPU_USE_COHERENT_SYSMEM) &&
-            ap == APERTURE_SYSMEM)
-                ap = __APERTURE_SYSMEM_COH;
-
-        return __nvgpu_aperture_mask(g, ap,
-                                     sysmem_mask, sysmem_coh_mask, vidmem_mask);
-}
-
 void *nvgpu_sgt_get_next(struct nvgpu_sgt *sgt, void *sgl)
 {
         return sgt->ops->sgl_next(sgl);