From 074e5fed29c3ef6f1d7e0b68a48c8b08d68a7228 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 23 Apr 2019 13:07:03 -0700 Subject: [PATCH] gpu: nvgpu: Remove unused MM HAL operations Remove mm.get_kind_invalid and mm.get_kind_pitch since these HAL operations are no longer used. JIRA NVGPU-2042 Change-Id: Icfcf3ac3756da6e00168a5d513fcc21aaf872a92 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/2103671 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c | 2 -- drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c | 2 -- drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 10 ---------- drivers/gpu/nvgpu/gm20b/mm_gm20b.h | 2 -- drivers/gpu/nvgpu/hal/init/hal_gm20b.c | 2 -- drivers/gpu/nvgpu/hal/init/hal_gp10b.c | 2 -- drivers/gpu/nvgpu/hal/init/hal_gv100.c | 2 -- drivers/gpu/nvgpu/hal/init/hal_gv11b.c | 2 -- drivers/gpu/nvgpu/hal/init/hal_tu104.c | 2 -- drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 2 -- 10 files changed, 28 deletions(-) diff --git a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c index 9d2af5f19..af1e1ef4b 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -572,8 +572,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { .init_inst_block = gk20a_init_inst_block, .init_bar2_vm = gp10b_init_bar2_vm, .remove_bar2_vm = gp10b_remove_bar2_vm, - .get_kind_invalid = gm20b_get_kind_invalid, - .get_kind_pitch = gm20b_get_kind_pitch, .bar1_map_userd = vgpu_mm_bar1_map_userd, .vm_as_alloc_share = vgpu_vm_as_alloc_share, .vm_as_free_share = vgpu_vm_as_free_share, diff --git a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c index 404165175..ac86c993b 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -664,8 +664,6 @@ static const struct gpu_ops vgpu_gv11b_ops = { .init_mm_setup_hw = NULL, .is_bar1_supported = gv11b_mm_is_bar1_supported, .init_inst_block = gv11b_init_inst_block, - .get_kind_invalid = gm20b_get_kind_invalid, - .get_kind_pitch = gm20b_get_kind_pitch, .init_bar2_vm = gp10b_init_bar2_vm, .remove_bar2_vm = gp10b_remove_bar2_vm, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index 5e68f1df6..744130dd4 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c @@ -49,13 +49,3 @@ u64 gm20b_gpu_phys_addr(struct gk20a *g, { return phys; } - -u32 gm20b_get_kind_invalid(void) -{ - return gmmu_pte_kind_invalid_v(); -} - -u32 gm20b_get_kind_pitch(void) -{ - return gmmu_pte_kind_pitch_v(); -} diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.h b/drivers/gpu/nvgpu/gm20b/mm_gm20b.h index 84ea8c0ec..6c6b78f7a 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.h @@ -33,6 +33,4 @@ bool gm20b_mm_support_sparse(struct gk20a *g); bool gm20b_mm_is_bar1_supported(struct gk20a *g); u64 gm20b_gpu_phys_addr(struct gk20a *g, struct nvgpu_gmmu_attrs *attrs, u64 phys); -u32 gm20b_get_kind_invalid(void); -u32 gm20b_get_kind_pitch(void); #endif /* NVGPU_GM20B_MM_GM20B_H */ diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c index 7dcab3120..1aa9bc61f 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c @@ -852,8 +852,6 @@ static const struct gpu_ops gm20b_ops = { .is_bar1_supported = gm20b_mm_is_bar1_supported, .alloc_inst_block = gk20a_alloc_inst_block, .init_inst_block = gk20a_init_inst_block, - .get_kind_invalid = gm20b_get_kind_invalid, - .get_kind_pitch = gm20b_get_kind_pitch, .bar1_map_userd = gk20a_mm_bar1_map_userd, .cache = { .fb_flush = gk20a_mm_fb_flush, diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c index 23b7178b8..77e7676d9 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c @@ -934,8 +934,6 @@ static const struct gpu_ops gp10b_ops = { .init_inst_block = gk20a_init_inst_block, .init_bar2_vm = gp10b_init_bar2_vm, .remove_bar2_vm = gp10b_remove_bar2_vm, - .get_kind_invalid = gm20b_get_kind_invalid, - .get_kind_pitch = gm20b_get_kind_pitch, .bar1_map_userd = gk20a_mm_bar1_map_userd, .cache = { .fb_flush = gk20a_mm_fb_flush, diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv100.c b/drivers/gpu/nvgpu/hal/init/hal_gv100.c index 6e9b0ccfd..b424a4129 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv100.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv100.c @@ -1120,8 +1120,6 @@ static const struct gpu_ops gv100_ops = { .is_bar1_supported = gv11b_mm_is_bar1_supported, .alloc_inst_block = gk20a_alloc_inst_block, .init_inst_block = gv11b_init_inst_block, - .get_kind_invalid = gm20b_get_kind_invalid, - .get_kind_pitch = gm20b_get_kind_pitch, .init_bar2_vm = gp10b_init_bar2_vm, .remove_bar2_vm = gp10b_remove_bar2_vm, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c index 1af51b009..959469553 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c @@ -1095,8 +1095,6 @@ static const struct gpu_ops gv11b_ops = { .is_bar1_supported = gv11b_mm_is_bar1_supported, .alloc_inst_block = gk20a_alloc_inst_block, .init_inst_block = gv11b_init_inst_block, - .get_kind_invalid = gm20b_get_kind_invalid, - .get_kind_pitch = gm20b_get_kind_pitch, .init_bar2_vm = gp10b_init_bar2_vm, .remove_bar2_vm = gp10b_remove_bar2_vm, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c index 943744290..8d4a61c96 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -1155,8 +1155,6 @@ static const struct gpu_ops tu104_ops = { .is_bar1_supported = gv11b_mm_is_bar1_supported, .alloc_inst_block = gk20a_alloc_inst_block, .init_inst_block = gv11b_init_inst_block, - .get_kind_invalid = gm20b_get_kind_invalid, - .get_kind_pitch = gm20b_get_kind_pitch, .init_bar2_vm = gp10b_init_bar2_vm, .remove_bar2_vm = gp10b_remove_bar2_vm, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index 1f207b804..e8723d121 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h @@ -1275,8 +1275,6 @@ struct gpu_ops { struct vm_gk20a *vm, u32 big_page_size); void (*fault_info_mem_destroy)(struct gk20a *g); void (*mmu_fault_disable_hw)(struct gk20a *g); - u32 (*get_kind_invalid)(void); - u32 (*get_kind_pitch)(void); u32 (*get_flush_retries)(struct gk20a *g, enum nvgpu_flush_op op); u64 (*bar1_map_userd)(struct gk20a *g, struct nvgpu_mem *mem, u32 offset);