diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/cde_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index f0927692..74de7e8e 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <trace/events/gk20a.h> | 26 | #include <trace/events/gk20a.h> |
27 | 27 | ||
28 | #include <nvgpu/dma.h> | 28 | #include <nvgpu/dma.h> |
29 | #include <nvgpu/gmmu.h> | ||
29 | #include <nvgpu/timers.h> | 30 | #include <nvgpu/timers.h> |
30 | #include <nvgpu/nvgpu_common.h> | 31 | #include <nvgpu/nvgpu_common.h> |
31 | #include <nvgpu/kmem.h> | 32 | #include <nvgpu/kmem.h> |
@@ -83,8 +84,8 @@ __must_hold(&cde_app->mutex) | |||
83 | 84 | ||
84 | /* release mapped memory */ | 85 | /* release mapped memory */ |
85 | gk20a_deinit_cde_img(cde_ctx); | 86 | gk20a_deinit_cde_img(cde_ctx); |
86 | gk20a_gmmu_unmap(vm, cde_ctx->backing_store_vaddr, | 87 | nvgpu_gmmu_unmap(vm, &g->gr.compbit_store.mem, |
87 | g->gr.compbit_store.mem.size, 1); | 88 | cde_ctx->backing_store_vaddr); |
88 | 89 | ||
89 | /* free the channel */ | 90 | /* free the channel */ |
90 | gk20a_channel_close(ch); | 91 | gk20a_channel_close(ch); |
@@ -1241,7 +1242,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1241 | } | 1242 | } |
1242 | 1243 | ||
1243 | /* map backing store to gpu virtual space */ | 1244 | /* map backing store to gpu virtual space */ |
1244 | vaddr = gk20a_gmmu_map(ch->vm, &gr->compbit_store.mem.priv.sgt, | 1245 | vaddr = nvgpu_gmmu_map(ch->vm, &gr->compbit_store.mem, |
1245 | g->gr.compbit_store.mem.size, | 1246 | g->gr.compbit_store.mem.size, |
1246 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, | 1247 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, |
1247 | gk20a_mem_flag_read_only, | 1248 | gk20a_mem_flag_read_only, |
@@ -1272,7 +1273,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1272 | return 0; | 1273 | return 0; |
1273 | 1274 | ||
1274 | err_init_cde_img: | 1275 | err_init_cde_img: |
1275 | gk20a_gmmu_unmap(ch->vm, vaddr, g->gr.compbit_store.mem.size, 1); | 1276 | nvgpu_gmmu_unmap(ch->vm, &g->gr.compbit_store.mem, vaddr); |
1276 | err_map_backingstore: | 1277 | err_map_backingstore: |
1277 | err_alloc_gpfifo: | 1278 | err_alloc_gpfifo: |
1278 | gk20a_vm_put(ch->vm); | 1279 | gk20a_vm_put(ch->vm); |