diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-01-09 13:47:40 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-01-12 15:42:57 -0500 |
commit | ece3d958b306f00dad76ed6f9b83ce136b4769f2 (patch) | |
tree | 81d1bdce3311575661e3f30d7dbf957d1d1c330f /drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |
parent | 44a1208fecab46f6e660d0315579c86cb6f32d0a (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/hal_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 7c22448d..aa3d52af 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -292,7 +292,7 @@ static const struct gpu_ops gv11b_ops = { | |||
292 | .pagepool_default_size = gr_gv11b_pagepool_default_size, | 292 | .pagepool_default_size = gr_gv11b_pagepool_default_size, |
293 | .init_ctx_state = gr_gp10b_init_ctx_state, | 293 | .init_ctx_state = gr_gp10b_init_ctx_state, |
294 | .alloc_gr_ctx = gr_gp10b_alloc_gr_ctx, | 294 | .alloc_gr_ctx = gr_gp10b_alloc_gr_ctx, |
295 | .free_gr_ctx = gr_gp10b_free_gr_ctx, | 295 | .free_gr_ctx = gr_gk20a_free_gr_ctx, |
296 | .update_ctxsw_preemption_mode = | 296 | .update_ctxsw_preemption_mode = |
297 | gr_gv11b_update_ctxsw_preemption_mode, | 297 | gr_gv11b_update_ctxsw_preemption_mode, |
298 | .dump_gr_regs = gr_gv11b_dump_gr_status_regs, | 298 | .dump_gr_regs = gr_gv11b_dump_gr_status_regs, |