From e899ec032e46f1b2d19b76ed27e69de3b08e4699 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 5 Jul 2018 13:10:50 -0700 Subject: gpu: nvgpu: Remove gv11b specific BAR2 deinit gp10b and gv11b variants of remove_bar2_vm are now identical, so delete the gv11b version and use only gp10b version. JIRA NVGPU-714 Change-Id: Ie98cb29803358ddcad8aae2cf865f3baeddebfb1 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1773007 Reviewed-by: Seshendra Gadagottu Reviewed-by: Alex Waterman Reviewed-by: svccoveritychecker Reviewed-by: svc-misra-checker Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 +- drivers/gpu/nvgpu/gv11b/mm_gv11b.c | 10 ---------- drivers/gpu/nvgpu/gv11b/mm_gv11b.h | 1 - drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 2 +- 5 files changed, 3 insertions(+), 14 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 20f045b2..00007044 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -680,7 +680,7 @@ static const struct gpu_ops gv100_ops = { .get_kind_invalid = gm20b_get_kind_invalid, .get_kind_pitch = gm20b_get_kind_pitch, .init_bar2_vm = gp10b_init_bar2_vm, - .remove_bar2_vm = gv11b_mm_remove_bar2_vm, + .remove_bar2_vm = gp10b_remove_bar2_vm, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, .get_flush_retries = gv100_mm_get_flush_retries, }, diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index a243e81c..9e9387d0 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -648,7 +648,7 @@ static const struct gpu_ops gv11b_ops = { .get_kind_invalid = gm20b_get_kind_invalid, .get_kind_pitch = gm20b_get_kind_pitch, .init_bar2_vm = gp10b_init_bar2_vm, - .remove_bar2_vm = gv11b_mm_remove_bar2_vm, + .remove_bar2_vm = gp10b_remove_bar2_vm, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, }, .therm = { diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c index aa2e2cf1..e37ea158 100644 --- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c @@ -153,16 +153,6 @@ static void gv11b_mm_mmu_hw_fault_buf_init(struct gk20a *g, *hub_intr_types |= HUB_INTR_TYPE_REPLAY; } -void gv11b_mm_remove_bar2_vm(struct gk20a *g) -{ - struct mm_gk20a *mm = &g->mm; - - nvgpu_log_fn(g, " "); - - nvgpu_free_inst_block(g, &mm->bar2.inst_block); - nvgpu_vm_put(mm->bar2.vm); -} - static void gv11b_mm_mmu_fault_setup_hw(struct gk20a *g) { if (nvgpu_mem_is_valid( diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.h b/drivers/gpu/nvgpu/gv11b/mm_gv11b.h index f5f89d94..6ad4a91a 100644 --- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.h @@ -32,7 +32,6 @@ bool gv11b_mm_is_bar1_supported(struct gk20a *g); void gv11b_init_inst_block(struct nvgpu_mem *inst_block, struct vm_gk20a *vm, u32 big_page_size); bool gv11b_mm_mmu_fault_pending(struct gk20a *g); -void gv11b_mm_remove_bar2_vm(struct gk20a *g); int gv11b_init_mm_setup_hw(struct gk20a *g); void gv11b_mm_l2_flush(struct gk20a *g, bool invalidate); u64 gv11b_gpu_phys_addr(struct gk20a *g, diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index d4a113f8..60beab9f 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c @@ -503,7 +503,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { .get_kind_invalid = gm20b_get_kind_invalid, .get_kind_pitch = gm20b_get_kind_pitch, .init_bar2_vm = gp10b_init_bar2_vm, - .remove_bar2_vm = gv11b_mm_remove_bar2_vm, + .remove_bar2_vm = gp10b_remove_bar2_vm, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, }, .therm = { -- cgit v1.2.2