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/gp106 | |
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/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index eec0f917..f35abac7 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "common/clock_gating/gp106_gating_reglist.h" | 26 | #include "common/clock_gating/gp106_gating_reglist.h" |
27 | #include "common/ptimer/ptimer_gk20a.h" | 27 | #include "common/ptimer/ptimer_gk20a.h" |
28 | #include "common/bus/bus_gm20b.h" | 28 | #include "common/bus/bus_gm20b.h" |
29 | #include "common/bus/bus_gp10b.h" | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/fifo_gk20a.h" | 32 | #include "gk20a/fifo_gk20a.h" |
@@ -583,7 +584,6 @@ static const struct gpu_ops gp106_ops = { | |||
583 | .init_inst_block = gk20a_init_inst_block, | 584 | .init_inst_block = gk20a_init_inst_block, |
584 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, | 585 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, |
585 | .init_bar2_vm = gp10b_init_bar2_vm, | 586 | .init_bar2_vm = gp10b_init_bar2_vm, |
586 | .init_bar2_mm_hw_setup = gp10b_init_bar2_mm_hw_setup, | ||
587 | .remove_bar2_vm = gp10b_remove_bar2_vm, | 587 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
588 | .get_vidmem_size = gp106_mm_get_vidmem_size, | 588 | .get_vidmem_size = gp106_mm_get_vidmem_size, |
589 | .get_kind_invalid = gm20b_get_kind_invalid, | 589 | .get_kind_invalid = gm20b_get_kind_invalid, |
@@ -723,6 +723,7 @@ static const struct gpu_ops gp106_ops = { | |||
723 | .init_hw = gk20a_bus_init_hw, | 723 | .init_hw = gk20a_bus_init_hw, |
724 | .isr = gk20a_bus_isr, | 724 | .isr = gk20a_bus_isr, |
725 | .bar1_bind = gm20b_bus_bar1_bind, | 725 | .bar1_bind = gm20b_bus_bar1_bind, |
726 | .bar2_bind = gp10b_bus_bar2_bind, | ||
726 | .set_bar0_window = gk20a_bus_set_bar0_window, | 727 | .set_bar0_window = gk20a_bus_set_bar0_window, |
727 | }, | 728 | }, |
728 | .ptimer = { | 729 | .ptimer = { |