summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/gr_gp10b.h
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-01-09 13:47:40 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-01-12 15:42:57 -0500
commitece3d958b306f00dad76ed6f9b83ce136b4769f2 (patch)
tree81d1bdce3311575661e3f30d7dbf957d1d1c330f /drivers/gpu/nvgpu/gp10b/gr_gp10b.h
parent44a1208fecab46f6e660d0315579c86cb6f32d0a (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/gp10b/gr_gp10b.h')
-rw-r--r--drivers/gpu/nvgpu/gp10b/gr_gp10b.h2
1 files changed, 0 insertions, 2 deletions
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,
101 struct gr_ctx_desc **gr_ctx, struct vm_gk20a *vm, 101 struct gr_ctx_desc **gr_ctx, struct vm_gk20a *vm,
102 u32 class, 102 u32 class,
103 u32 flags); 103 u32 flags);
104void gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
105 struct gr_ctx_desc *gr_ctx);
106void gr_gp10b_update_ctxsw_preemption_mode(struct gk20a *g, 104void gr_gp10b_update_ctxsw_preemption_mode(struct gk20a *g,
107 struct channel_ctx_gk20a *ch_ctx, 105 struct channel_ctx_gk20a *ch_ctx,
108 struct nvgpu_mem *mem); 106 struct nvgpu_mem *mem);