nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Remove gv11b specific BAR2 deinit

Browse Source 
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1773007
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Terje Bergstrom
2018-07-05 13:10:50 -07:00
committed by mobile promotions
parent 5f8bb126a0
commit e899ec032e
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/gv100/hal_gv100.c
View File

@@ -680,7 +680,7 @@ static const struct gpu_ops gv100_ops = {
.get_kind_invalid = gm20b_get_kind_invalid, .get_kind_invalid = gm20b_get_kind_invalid,
.get_kind_pitch = gm20b_get_kind_pitch, .get_kind_pitch = gm20b_get_kind_pitch,
.init_bar2_vm = gp10b_init_bar2_vm, .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, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy,
.get_flush_retries = gv100_mm_get_flush_retries, .get_flush_retries = gv100_mm_get_flush_retries,
}, },

2
drivers/gpu/nvgpu/gv11b/hal_gv11b.c
View File

@@ -648,7 +648,7 @@ static const struct gpu_ops gv11b_ops = {
.get_kind_invalid = gm20b_get_kind_invalid, .get_kind_invalid = gm20b_get_kind_invalid,
.get_kind_pitch = gm20b_get_kind_pitch, .get_kind_pitch = gm20b_get_kind_pitch,
.init_bar2_vm = gp10b_init_bar2_vm, .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, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy,
}, },
.therm = { .therm = {

10
drivers/gpu/nvgpu/gv11b/mm_gv11b.c
View File

@@ -153,16 +153,6 @@ static void gv11b_mm_mmu_hw_fault_buf_init(struct gk20a *g,
*hub_intr_types |= HUB_INTR_TYPE_REPLAY; *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) static void gv11b_mm_mmu_fault_setup_hw(struct gk20a *g)
{ {
if (nvgpu_mem_is_valid( if (nvgpu_mem_is_valid(

1
drivers/gpu/nvgpu/gv11b/mm_gv11b.h
View File

@@ -32,7 +32,6 @@ bool gv11b_mm_is_bar1_supported(struct gk20a *g);
void gv11b_init_inst_block(struct nvgpu_mem *inst_block, void gv11b_init_inst_block(struct nvgpu_mem *inst_block,
struct vm_gk20a *vm, u32 big_page_size); struct vm_gk20a *vm, u32 big_page_size);
bool gv11b_mm_mmu_fault_pending(struct gk20a *g); 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); int gv11b_init_mm_setup_hw(struct gk20a *g);
void gv11b_mm_l2_flush(struct gk20a *g, bool invalidate); void gv11b_mm_l2_flush(struct gk20a *g, bool invalidate);
u64 gv11b_gpu_phys_addr(struct gk20a *g, u64 gv11b_gpu_phys_addr(struct gk20a *g,

2
drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
View File

@@ -503,7 +503,7 @@ static const struct gpu_ops vgpu_gv11b_ops = {
.get_kind_invalid = gm20b_get_kind_invalid, .get_kind_invalid = gm20b_get_kind_invalid,
.get_kind_pitch = gm20b_get_kind_pitch, .get_kind_pitch = gm20b_get_kind_pitch,
.init_bar2_vm = gp10b_init_bar2_vm, .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, .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy,
}, },
.therm = { .therm = {