diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-05-25 13:27:10 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:07 -0400 |
commit | 27694ca572c4d7698b107c6713f0f0604b41c186 (patch) | |
tree | 60dc8a1a8518797fd95f82d1e02892a984911667 /drivers/gpu/nvgpu/gv100 | |
parent | 5c8f1619ce5ab1cf46484c8914fa29bcc208b9a0 (diff) |
gpu: nvgpu: Implement bus HAL for bar2 bind
Implement BAR2 bind as a bus HAL and remove the corresponding MM HAL.
BAR2 bind HW API is in bus.
JIRA NVGPU-588
Change-Id: I3a8391b00f1ba65f9ed28b633f1d52bf7c984230
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730896
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv100')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index dd3a5398..13e0c1a3 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "common/bus/bus_gk20a.h" | 25 | #include "common/bus/bus_gk20a.h" |
26 | #include "common/bus/bus_gp10b.h" | ||
26 | #include "common/clock_gating/gv100_gating_reglist.h" | 27 | #include "common/clock_gating/gv100_gating_reglist.h" |
27 | #include "common/ptimer/ptimer_gk20a.h" | 28 | #include "common/ptimer/ptimer_gk20a.h" |
28 | 29 | ||
@@ -653,7 +654,6 @@ static const struct gpu_ops gv100_ops = { | |||
653 | .get_kind_invalid = gm20b_get_kind_invalid, | 654 | .get_kind_invalid = gm20b_get_kind_invalid, |
654 | .get_kind_pitch = gm20b_get_kind_pitch, | 655 | .get_kind_pitch = gm20b_get_kind_pitch, |
655 | .init_bar2_vm = gp10b_init_bar2_vm, | 656 | .init_bar2_vm = gp10b_init_bar2_vm, |
656 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | ||
657 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 657 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |
658 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 658 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |
659 | .get_flush_retries = gv100_mm_get_flush_retries, | 659 | .get_flush_retries = gv100_mm_get_flush_retries, |
@@ -792,6 +792,7 @@ static const struct gpu_ops gv100_ops = { | |||
792 | .init_hw = gk20a_bus_init_hw, | 792 | .init_hw = gk20a_bus_init_hw, |
793 | .isr = gk20a_bus_isr, | 793 | .isr = gk20a_bus_isr, |
794 | .bar1_bind = NULL, | 794 | .bar1_bind = NULL, |
795 | .bar2_bind = gp10b_bus_bar2_bind, | ||
795 | .set_bar0_window = gk20a_bus_set_bar0_window, | 796 | .set_bar0_window = gk20a_bus_set_bar0_window, |
796 | }, | 797 | }, |
797 | .ptimer = { | 798 | .ptimer = { |