diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index b8993052..46626bb7 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <soc/tegra/fuse.h> | 21 | #include <soc/tegra/fuse.h> |
22 | 22 | ||
23 | #include <nvgpu/timers.h> | 23 | #include <nvgpu/timers.h> |
24 | #include <nvgpu/gmmu.h> | ||
24 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
25 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
26 | 27 | ||
@@ -534,8 +535,8 @@ int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, | |||
534 | if (err) | 535 | if (err) |
535 | return err; | 536 | return err; |
536 | 537 | ||
537 | mem->gpu_va = gk20a_gmmu_map(vm, | 538 | mem->gpu_va = nvgpu_gmmu_map(vm, |
538 | &mem->priv.sgt, | 539 | mem, |
539 | size, | 540 | size, |
540 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, | 541 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, |
541 | gk20a_mem_flag_none, | 542 | gk20a_mem_flag_none, |
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index dcf69adf..6aa58337 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/dma.h> | 23 | #include <nvgpu/dma.h> |
24 | #include <nvgpu/log.h> | 24 | #include <nvgpu/log.h> |
25 | #include <nvgpu/gmmu.h> | ||
25 | 26 | ||
26 | #include <nvgpu/hw/gv11b/hw_ram_gv11b.h> | 27 | #include <nvgpu/hw/gv11b/hw_ram_gv11b.h> |
27 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> | 28 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> |
@@ -38,8 +39,7 @@ void gv11b_free_subctx_header(struct channel_gk20a *c) | |||
38 | gk20a_dbg_fn(""); | 39 | gk20a_dbg_fn(""); |
39 | 40 | ||
40 | if (ctx->mem.gpu_va) { | 41 | if (ctx->mem.gpu_va) { |
41 | gk20a_gmmu_unmap(c->vm, ctx->mem.gpu_va, | 42 | nvgpu_gmmu_unmap(c->vm, &ctx->mem, ctx->mem.gpu_va); |
42 | ctx->mem.size, gk20a_mem_flag_none); | ||
43 | 43 | ||
44 | nvgpu_dma_free(g, &ctx->mem); | 44 | nvgpu_dma_free(g, &ctx->mem); |
45 | } | 45 | } |
@@ -63,8 +63,8 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
63 | nvgpu_err(g, "failed to allocate sub ctx header"); | 63 | nvgpu_err(g, "failed to allocate sub ctx header"); |
64 | return ret; | 64 | return ret; |
65 | } | 65 | } |
66 | ctx->mem.gpu_va = gk20a_gmmu_map(c->vm, | 66 | ctx->mem.gpu_va = nvgpu_gmmu_map(c->vm, |
67 | &ctx->mem.priv.sgt, | 67 | &ctx->mem, |
68 | ctx->mem.size, | 68 | ctx->mem.size, |
69 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, | 69 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, |
70 | gk20a_mem_flag_none, true, | 70 | gk20a_mem_flag_none, true, |