From ece3d958b306f00dad76ed6f9b83ce136b4769f2 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 9 Jan 2018 10:47:40 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1635127 Reviewed-by: Seshendra Gadagottu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gp106/hal_gp106.c') diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index dc3b7868..1498d1c0 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -292,7 +292,7 @@ static const struct gpu_ops gp106_ops = { .pagepool_default_size = gr_gp106_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, -- cgit v1.2.2