gpu: nvgpu: Combine gk20a and gp10b free_gr_ctx

gp10b version of free_gr_ctx was created to keep gp10b source code
changes out from the mainline. gp10b was merged back to mainline a
while ago, so this separation is no longer needed. Merge the two
variants.

Change-Id: I954b3b677e98e4248f95641ea22e0def4e583c66
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1635127
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 1 insertions, 24 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index ca2bc52b..56acc732 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -1167,27 +1167,6 @@ void gr_gp10b_dump_ctxsw_stats(struct gk20a *g, struct vm_gk20a *vm,
         nvgpu_mem_end(g, mem);
 }
 
-void gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
-                          struct gr_ctx_desc *gr_ctx)
-{
-        gk20a_dbg_fn("");
-
-        if (!gr_ctx)
-                return;
-
-        if (g->ops.gr.dump_ctxsw_stats &&
-            g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close)
-                g->ops.gr.dump_ctxsw_stats(g, vm, gr_ctx);
-
-        nvgpu_dma_unmap_free(vm, &gr_ctx->pagepool_ctxsw_buffer);
-        nvgpu_dma_unmap_free(vm, &gr_ctx->betacb_ctxsw_buffer);
-        nvgpu_dma_unmap_free(vm, &gr_ctx->spill_ctxsw_buffer);
-        nvgpu_dma_unmap_free(vm, &gr_ctx->preempt_ctxsw_buffer);
-        gr_gk20a_free_gr_ctx(g, vm, gr_ctx);
-        gk20a_dbg_fn("done");
-}
-
-
 void gr_gp10b_update_ctxsw_preemption_mode(struct gk20a *g,
                 struct channel_ctx_gk20a *ch_ctx,
                 struct nvgpu_mem *mem)
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h
index 64a076ef..e3ef6304 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h
@@ -101,8 +101,6 @@ int gr_gp10b_alloc_gr_ctx(struct gk20a *g,
                           struct gr_ctx_desc **gr_ctx, struct vm_gk20a *vm,
                           u32 class,
                           u32 flags);
-void gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
-                          struct gr_ctx_desc *gr_ctx);
 void gr_gp10b_update_ctxsw_preemption_mode(struct gk20a *g,
                 struct channel_ctx_gk20a *ch_ctx,
                 struct nvgpu_mem *mem);
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 7ca9e313..aaee595d 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -256,7 +256,7 @@ static const struct gpu_ops gp10b_ops = {
                 .pagepool_default_size = gr_gp10b_pagepool_default_size,
                 .init_ctx_state = gr_gp10b_init_ctx_state,
                 .alloc_gr_ctx = gr_gp10b_alloc_gr_ctx,
-                .free_gr_ctx = gr_gp10b_free_gr_ctx,
+                .free_gr_ctx = gr_gk20a_free_gr_ctx,
                 .update_ctxsw_preemption_mode =
                         gr_gp10b_update_ctxsw_preemption_mode,
                 .dump_gr_regs = gr_gp10b_dump_gr_status_regs,