diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/cde.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/cde.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c index 577d86e8..30edc1d5 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/common/linux/cde.c | |||
@@ -31,6 +31,8 @@ | |||
31 | #include <nvgpu/bug.h> | 31 | #include <nvgpu/bug.h> |
32 | #include <nvgpu/firmware.h> | 32 | #include <nvgpu/firmware.h> |
33 | 33 | ||
34 | #include <nvgpu/linux/vm.h> | ||
35 | |||
34 | #include "gk20a/gk20a.h" | 36 | #include "gk20a/gk20a.h" |
35 | #include "gk20a/channel_gk20a.h" | 37 | #include "gk20a/channel_gk20a.h" |
36 | #include "gk20a/mm_gk20a.h" | 38 | #include "gk20a/mm_gk20a.h" |
@@ -44,12 +46,6 @@ | |||
44 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 46 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
45 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 47 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
46 | 48 | ||
47 | /* | ||
48 | * Currently this code uses nvgpu_vm_map() since it takes dmabuf FDs from the | ||
49 | * CDE ioctls. That has to change - instead this needs to take an nvgpu_mem. | ||
50 | */ | ||
51 | #include "common/linux/vm_priv.h" | ||
52 | |||
53 | static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx); | 49 | static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx); |
54 | static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct nvgpu_os_linux *l); | 50 | static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct nvgpu_os_linux *l); |
55 | 51 | ||
@@ -1052,8 +1048,8 @@ __releases(&l->cde_app->mutex) | |||
1052 | 1048 | ||
1053 | 1049 | ||
1054 | /* map the destination buffer */ | 1050 | /* map the destination buffer */ |
1055 | get_dma_buf(compbits_scatter_buf); /* a ref for nvgpu_vm_map */ | 1051 | get_dma_buf(compbits_scatter_buf); /* a ref for nvgpu_vm_map_linux */ |
1056 | map_vaddr = nvgpu_vm_map(cde_ctx->vm, compbits_scatter_buf, 0, | 1052 | map_vaddr = nvgpu_vm_map_linux(cde_ctx->vm, compbits_scatter_buf, 0, |
1057 | NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE | | 1053 | NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE | |
1058 | NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL, | 1054 | NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL, |
1059 | NV_KIND_INVALID, | 1055 | NV_KIND_INVALID, |