From 7872900486bd31cf186930848adec46d0a13b68a Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Mon, 17 Apr 2017 21:20:19 +0100 Subject: 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 Reviewed-on: http://git-master/r/1464109 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker Reviewed-by: Konsta Holtta GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/subctx_gv11b.c') 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) return ret; } ctx->mem.gpu_va = gk20a_gmmu_map(c->vm, - &ctx->mem.sgt, + &ctx->mem.priv.sgt, ctx->mem.size, NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, gk20a_mem_flag_none, true, @@ -99,7 +99,7 @@ static void gv11b_init_subcontext_pdb(struct channel_gk20a *c, gk20a_dbg_fn(""); /* load main pdb as veid0 pdb also */ vm = c->vm; - pdb_addr = g->ops.mm.get_iova_addr(g, vm->pdb.mem.sgt->sgl, 0); + pdb_addr = g->ops.mm.get_iova_addr(g, vm->pdb.mem.priv.sgt->sgl, 0); pdb_addr_lo = u64_lo32(pdb_addr >> ram_in_base_shift_v()); pdb_addr_hi = u64_hi32(pdb_addr); format_word = ram_in_sc_page_dir_base_target_f( -- cgit v1.2.2