From 5477d0f4c226847fe030ad00425e00206118b0d6 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 8 Dec 2014 14:07:39 +0200 Subject: gpu: nvgpu: Generic mem_desc & allocation Make mem_desc a generic container for buffers. Add functions for allocating and mapping buffers to an address space which store their data in mem_desc. Change-Id: I031643442c6fd41f5e7222fe9b7bfcaf9b784db5 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/660908 GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index f2b0c83c..867e775a 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -1618,11 +1618,9 @@ int gr_gk20a_load_golden_ctx_image(struct gk20a *g, virt_addr_hi); /* no user for client managed performance counter ctx */ - ch_ctx->pm_ctx.ctx_sw_mode = - ctxsw_prog_main_image_pm_mode_no_ctxsw_f(); data = gk20a_mem_rd32(ctx_ptr + ctxsw_prog_main_image_pm_o(), 0); data = data & ~ctxsw_prog_main_image_pm_mode_m(); - data |= ch_ctx->pm_ctx.ctx_sw_mode; + data |= ctxsw_prog_main_image_pm_mode_no_ctxsw_f(); gk20a_mem_wr32(ctx_ptr + ctxsw_prog_main_image_pm_o(), 0, data); -- cgit v1.2.2