diff options
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/mm_gv11b.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/mm_gv11b.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 2 |
5 files changed, 3 insertions, 14 deletions
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 = { | |||
680 | .get_kind_invalid = gm20b_get_kind_invalid, | 680 | .get_kind_invalid = gm20b_get_kind_invalid, |
681 | .get_kind_pitch = gm20b_get_kind_pitch, | 681 | .get_kind_pitch = gm20b_get_kind_pitch, |
682 | .init_bar2_vm = gp10b_init_bar2_vm, | 682 | .init_bar2_vm = gp10b_init_bar2_vm, |
683 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 683 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
684 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 684 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |
685 | .get_flush_retries = gv100_mm_get_flush_retries, | 685 | .get_flush_retries = gv100_mm_get_flush_retries, |
686 | }, | 686 | }, |
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 = { | |||
648 | .get_kind_invalid = gm20b_get_kind_invalid, | 648 | .get_kind_invalid = gm20b_get_kind_invalid, |
649 | .get_kind_pitch = gm20b_get_kind_pitch, | 649 | .get_kind_pitch = gm20b_get_kind_pitch, |
650 | .init_bar2_vm = gp10b_init_bar2_vm, | 650 | .init_bar2_vm = gp10b_init_bar2_vm, |
651 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 651 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
652 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 652 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |
653 | }, | 653 | }, |
654 | .therm = { | 654 | .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, | |||
153 | *hub_intr_types |= HUB_INTR_TYPE_REPLAY; | 153 | *hub_intr_types |= HUB_INTR_TYPE_REPLAY; |
154 | } | 154 | } |
155 | 155 | ||
156 | void gv11b_mm_remove_bar2_vm(struct gk20a *g) | ||
157 | { | ||
158 | struct mm_gk20a *mm = &g->mm; | ||
159 | |||
160 | nvgpu_log_fn(g, " "); | ||
161 | |||
162 | nvgpu_free_inst_block(g, &mm->bar2.inst_block); | ||
163 | nvgpu_vm_put(mm->bar2.vm); | ||
164 | } | ||
165 | |||
166 | static void gv11b_mm_mmu_fault_setup_hw(struct gk20a *g) | 156 | static void gv11b_mm_mmu_fault_setup_hw(struct gk20a *g) |
167 | { | 157 | { |
168 | if (nvgpu_mem_is_valid( | 158 | 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); | |||
32 | void gv11b_init_inst_block(struct nvgpu_mem *inst_block, | 32 | void gv11b_init_inst_block(struct nvgpu_mem *inst_block, |
33 | struct vm_gk20a *vm, u32 big_page_size); | 33 | struct vm_gk20a *vm, u32 big_page_size); |
34 | bool gv11b_mm_mmu_fault_pending(struct gk20a *g); | 34 | bool gv11b_mm_mmu_fault_pending(struct gk20a *g); |
35 | void gv11b_mm_remove_bar2_vm(struct gk20a *g); | ||
36 | int gv11b_init_mm_setup_hw(struct gk20a *g); | 35 | int gv11b_init_mm_setup_hw(struct gk20a *g); |
37 | void gv11b_mm_l2_flush(struct gk20a *g, bool invalidate); | 36 | void gv11b_mm_l2_flush(struct gk20a *g, bool invalidate); |
38 | u64 gv11b_gpu_phys_addr(struct gk20a *g, | 37 | 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 = { | |||
503 | .get_kind_invalid = gm20b_get_kind_invalid, | 503 | .get_kind_invalid = gm20b_get_kind_invalid, |
504 | .get_kind_pitch = gm20b_get_kind_pitch, | 504 | .get_kind_pitch = gm20b_get_kind_pitch, |
505 | .init_bar2_vm = gp10b_init_bar2_vm, | 505 | .init_bar2_vm = gp10b_init_bar2_vm, |
506 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 506 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
507 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 507 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |
508 | }, | 508 | }, |
509 | .therm = { | 509 | .therm = { |