From 231094acad3d4d926321feeda820bed8475846b5 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Sun, 17 Mar 2019 17:24:45 +0530 Subject: [PATCH] gpu: nvgpu: remove gr_tu104_free_gr_ctx() gr_ctx->gfxp_rtvcb_ctxsw_buffer buffer is already being released in nvgpu_gr_ctx_free() and there is no need for this tu104 specific hal Remove gr_tu104_free_gr_ctx() and re-use gr_gk20a_free_gr_ctx() for tu104 Jira NVGPU-1887 Change-Id: Iee2bc04d3911e0f030170a032f3f457b67ce7e74 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/2075234 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/tu104/gr_tu104.c | 12 ------------ drivers/gpu/nvgpu/tu104/gr_tu104.h | 4 ---- drivers/gpu/nvgpu/tu104/hal_tu104.c | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/gpu/nvgpu/tu104/gr_tu104.c b/drivers/gpu/nvgpu/tu104/gr_tu104.c index 0b86d9ec3..898bdf67b 100644 --- a/drivers/gpu/nvgpu/tu104/gr_tu104.c +++ b/drivers/gpu/nvgpu/tu104/gr_tu104.c @@ -285,18 +285,6 @@ void gr_tu104_cb_size_default(struct gk20a *g) gr_gpc0_ppc0_cbm_beta_cb_size_v_gfxp_v(); } -void gr_tu104_free_gr_ctx(struct gk20a *g, - struct vm_gk20a *vm, struct nvgpu_gr_ctx *gr_ctx) -{ - nvgpu_log_fn(g, " "); - - if (gr_ctx != NULL) { - nvgpu_dma_unmap_free(vm, &gr_ctx->gfxp_rtvcb_ctxsw_buffer); - } - - gr_gk20a_free_gr_ctx(g, vm, gr_ctx); -} - void gr_tu104_enable_gpc_exceptions(struct gk20a *g) { struct gr_gk20a *gr = &g->gr; diff --git a/drivers/gpu/nvgpu/tu104/gr_tu104.h b/drivers/gpu/nvgpu/tu104/gr_tu104.h index 10e1139ae..a6303741b 100644 --- a/drivers/gpu/nvgpu/tu104/gr_tu104.h +++ b/drivers/gpu/nvgpu/tu104/gr_tu104.h @@ -84,10 +84,6 @@ int gr_tu104_init_gfxp_rtv_cb(struct gk20a *g, void gr_tu104_commit_gfxp_rtv_cb(struct gk20a *g, struct nvgpu_gr_ctx *gr_ctx, bool patch); -void gr_tu104_free_gr_ctx(struct gk20a *g, - struct vm_gk20a *vm, - struct nvgpu_gr_ctx *gr_ctx); - void gr_tu104_init_sm_dsm_reg_info(void); void gr_tu104_get_sm_dsm_perf_ctrl_regs(struct gk20a *g, u32 *num_sm_dsm_perf_ctrl_regs, u32 **sm_dsm_perf_ctrl_regs, diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 02734e64f..9739c34ed 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -406,7 +406,7 @@ static const struct gpu_ops tu104_ops = { .detect_sm_arch = gr_gv11b_detect_sm_arch, .pagepool_default_size = gr_gv11b_pagepool_default_size, .init_ctx_state = gr_gp10b_init_ctx_state, - .free_gr_ctx = gr_tu104_free_gr_ctx, + .free_gr_ctx = gr_gk20a_free_gr_ctx, .init_ctxsw_preemption_mode = gr_gp10b_init_ctxsw_preemption_mode, .update_ctxsw_preemption_mode =