Revert "Revert "Revert "gpu: nvgpu: Get coherency on gv100 + NVLINK working"""

This reverts commit 89fbf39a05483917c0a9f3453fd94c724bc37375.

Bug 2075315

Change-Id: Id34a0376be5160b164931926ec600f77edf69667
Signed-off-by: Timo Alho <talho@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1668487
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>

1 files changed, 0 insertions, 47 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index 2b32d869..f7c51f42 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -28,53 +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);
-}
-
-
 struct nvgpu_sgl *nvgpu_sgt_get_next(struct nvgpu_sgt *sgt,
                                      struct nvgpu_sgl *sgl)
 {