summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-04-17 16:20:19 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-20 19:14:32 -0400
commit7872900486bd31cf186930848adec46d0a13b68a (patch)
tree5c47a8d21beb00ce9530e1747c7aabafc2643d5f /drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
parent90d029fd28c25904bb84f929f1a65075a8d9b6e4 (diff)
gpu: nvgpu: Move Linux nvgpu_mem fields
t19x part for this change in nvgpu. JIRA NVGPU-12 JIRA NVGPU-30 Change-Id: I31116b4241076b39a6638273281630a1527bcd35 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1464109 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> Reviewed-by: Konsta Holtta <kholtta@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/subctx_gv11b.c')
-rw-r--r--drivers/gpu/nvgpu/gv11b/subctx_gv11b.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
index c3ff9185..dcf69adf 100644
--- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
@@ -64,7 +64,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c)
64 return ret; 64 return ret;
65 } 65 }
66 ctx->mem.gpu_va = gk20a_gmmu_map(c->vm, 66 ctx->mem.gpu_va = gk20a_gmmu_map(c->vm,
67 &ctx->mem.sgt, 67 &ctx->mem.priv.sgt,
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,
@@ -99,7 +99,7 @@ static void gv11b_init_subcontext_pdb(struct channel_gk20a *c,
99 gk20a_dbg_fn(""); 99 gk20a_dbg_fn("");
100 /* load main pdb as veid0 pdb also */ 100 /* load main pdb as veid0 pdb also */
101 vm = c->vm; 101 vm = c->vm;
102 pdb_addr = g->ops.mm.get_iova_addr(g, vm->pdb.mem.sgt->sgl, 0); 102 pdb_addr = g->ops.mm.get_iova_addr(g, vm->pdb.mem.priv.sgt->sgl, 0);
103 pdb_addr_lo = u64_lo32(pdb_addr >> ram_in_base_shift_v()); 103 pdb_addr_lo = u64_lo32(pdb_addr >> ram_in_base_shift_v());
104 pdb_addr_hi = u64_hi32(pdb_addr); 104 pdb_addr_hi = u64_hi32(pdb_addr);
105 format_word = ram_in_sc_page_dir_base_target_f( 105 format_word = ram_in_sc_page_dir_base_target_f(