From e9066a46c93bc433e13642b7f898ee9d90b8a52e Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 14 Dec 2018 11:16:38 -0800 Subject: [PATCH] gpu: nvgpu: vgpu: remove vgpu_gr_gp10b_alloc_gr_ctx vgpu_gr_gp10b_alloc_gr_ctx is identical to vgpu_gr_alloc_gr_ctx now. Jira NVGPU-1527 Change-Id: I9c568569d1a744a5a91a4d72536e3654d545d53e Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1973424 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | 16 ---------------- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.h | 3 --- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 2 +- drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 2 +- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c index 99d3d5cc6..11f3536e5 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c @@ -34,22 +34,6 @@ #include -int vgpu_gr_gp10b_alloc_gr_ctx(struct gk20a *g, - struct nvgpu_gr_ctx *gr_ctx, - struct vm_gk20a *vm) -{ - int err; - - nvgpu_log_fn(g, " "); - - err = vgpu_gr_alloc_gr_ctx(g, gr_ctx, vm); - if (err) - return err; - - nvgpu_log_fn(g, "done"); - return 0; -} - int vgpu_gr_gp10b_init_ctxsw_preemption_mode(struct gk20a *g, struct nvgpu_gr_ctx *gr_ctx, struct vm_gk20a *vm, diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.h b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.h index c70feeb9f..0e35243cc 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.h +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.h @@ -30,9 +30,6 @@ struct nvgpu_gr_ctx; struct vm_gk20a; struct channel_gk20a; -int vgpu_gr_gp10b_alloc_gr_ctx(struct gk20a *g, - struct nvgpu_gr_ctx *gr_ctx, - struct vm_gk20a *vm); int vgpu_gr_gp10b_init_ctxsw_preemption_mode(struct gk20a *g, struct nvgpu_gr_ctx *gr_ctx, struct vm_gk20a *vm, diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 093841285..8a233cf02 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c @@ -140,7 +140,7 @@ static const struct gpu_ops vgpu_gp10b_ops = { .add_zbc = NULL, .pagepool_default_size = gr_gp10b_pagepool_default_size, .init_ctx_state = vgpu_gr_gp10b_init_ctx_state, - .alloc_gr_ctx = vgpu_gr_gp10b_alloc_gr_ctx, + .alloc_gr_ctx = vgpu_gr_alloc_gr_ctx, .free_gr_ctx = vgpu_gr_free_gr_ctx, .init_ctxsw_preemption_mode = vgpu_gr_gp10b_init_ctxsw_preemption_mode, diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index 1525b4c8a..4a96a795b 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c @@ -155,7 +155,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { .add_zbc = NULL, .pagepool_default_size = gr_gv11b_pagepool_default_size, .init_ctx_state = vgpu_gr_gp10b_init_ctx_state, - .alloc_gr_ctx = vgpu_gr_gp10b_alloc_gr_ctx, + .alloc_gr_ctx = vgpu_gr_alloc_gr_ctx, .free_gr_ctx = vgpu_gr_free_gr_ctx, .init_ctxsw_preemption_mode = vgpu_gr_gp10b_init_ctxsw_preemption_mode,