nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Separate GMMU out of mm_gk20a.c

Browse Source 
t19x version of same named patch in nvgpu.

JIRA NVGPU-12
JIRA NVGPU-30

Change-Id: I0b176577c0edcdcc587f22a6908045a960f830e2
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1464111
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Alex Waterman
2017-04-17 22:16:00 +01:00
committed by mobile promotions
parent 4b990224df
commit 44dcc5a53f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/nvgpu/gv11b/gr_gv11b.c
View File

@@ -21,6 +21,7 @@
#include <soc/tegra/fuse.h>
#include <nvgpu/timers.h>
#include <nvgpu/gmmu.h>
#include <nvgpu/dma.h>
#include <nvgpu/log.h>
@@ -534,8 +535,8 @@ int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size,
if (err)
return err;
mem->gpu_va = gk20a_gmmu_map(vm,
&mem->priv.sgt,
mem->gpu_va = nvgpu_gmmu_map(vm,
mem,
size,
NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE,
gk20a_mem_flag_none,

8
drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
View File

@@ -22,6 +22,7 @@
#include <nvgpu/dma.h>
#include <nvgpu/log.h>
#include <nvgpu/gmmu.h>
#include <nvgpu/hw/gv11b/hw_ram_gv11b.h>
#include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
@@ -38,8 +39,7 @@ void gv11b_free_subctx_header(struct channel_gk20a *c)
gk20a_dbg_fn("");
if (ctx->mem.gpu_va) {
gk20a_gmmu_unmap(c->vm, ctx->mem.gpu_va,
ctx->mem.size, gk20a_mem_flag_none);
nvgpu_gmmu_unmap(c->vm, &ctx->mem, ctx->mem.gpu_va);
nvgpu_dma_free(g, &ctx->mem);
}
@@ -63,8 +63,8 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c)
nvgpu_err(g, "failed to allocate sub ctx header");
return ret;
}
ctx->mem.gpu_va = gk20a_gmmu_map(c->vm,
&ctx->mem.priv.sgt,
ctx->mem.gpu_va = nvgpu_gmmu_map(c->vm,
&ctx->mem,
ctx->mem.size,
NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE,
gk20a_mem_flag_none, true,