1 files changed, 1 insertions, 28 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c
index 45058321..b686d616 100644
--- a/drivers/gpu/nvgpu/common/linux/vm.c
+++ b/drivers/gpu/nvgpu/common/linux/vm.c
@@ -24,7 +24,6 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/vidmem.h>
-#include <nvgpu/enabled.h>
 
 #include <nvgpu/linux/vidmem.h>
 #include <nvgpu/linux/nvgpu_mem.h>
@@ -36,33 +35,7 @@
 
 #include "vm_priv.h"
 #include "os_linux.h"
-
-/*
- * Temporary location for this code until a dmabuf.c file exists.
- */
-enum nvgpu_aperture gk20a_dmabuf_aperture(struct gk20a *g,
-                                          struct dma_buf *dmabuf)
-{
-        struct gk20a *buf_owner = nvgpu_vidmem_buf_owner(dmabuf);
-        bool unified_memory = nvgpu_is_enabled(g, NVGPU_MM_UNIFIED_MEMORY);
-
-        if (buf_owner == NULL) {
-                /* Not nvgpu-allocated, assume system memory */
-                return APERTURE_SYSMEM;
-        } else if (WARN_ON(buf_owner == g && unified_memory)) {
-                /* Looks like our video memory, but this gpu doesn't support
-                 * it. Warn about a bug and bail out */
-                nvgpu_warn(g,
-                        "dmabuf is our vidmem but we don't have local vidmem");
-                return APERTURE_INVALID;
-        } else if (buf_owner != g) {
-                /* Someone else's vidmem */
-                return APERTURE_INVALID;
-        } else {
-                /* Yay, buf_owner == g */
-                return APERTURE_VIDMEM;
-        }
-}
+#include "dmabuf.h"
 
 static struct nvgpu_mapped_buf *__nvgpu_vm_find_mapped_buf_reverse(
         struct vm_gk20a *vm, struct dma_buf *dmabuf, u32 kind)