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/vgpu | |
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/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index c4ffe126..8c2b613f 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -427,7 +427,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
427 | .init_inst_block = gk20a_init_inst_block, | 427 | .init_inst_block = gk20a_init_inst_block, |
428 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, | 428 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, |
429 | .init_bar2_vm = gp10b_init_bar2_vm, | 429 | .init_bar2_vm = gp10b_init_bar2_vm, |
430 | .init_bar2_mm_hw_setup = gp10b_init_bar2_mm_hw_setup, | ||
431 | .remove_bar2_vm = gp10b_remove_bar2_vm, | 430 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
432 | .get_kind_invalid = gm20b_get_kind_invalid, | 431 | .get_kind_invalid = gm20b_get_kind_invalid, |
433 | .get_kind_pitch = gm20b_get_kind_pitch, | 432 | .get_kind_pitch = gm20b_get_kind_pitch, |
@@ -524,7 +523,8 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
524 | .bus = { | 523 | .bus = { |
525 | .init_hw = gk20a_bus_init_hw, | 524 | .init_hw = gk20a_bus_init_hw, |
526 | .isr = gk20a_bus_isr, | 525 | .isr = gk20a_bus_isr, |
527 | .bar1_bind = gm20b_bus_bar1_bind, | 526 | .bar1_bind = NULL, |
527 | .bar2_bind = NULL, | ||
528 | .set_bar0_window = gk20a_bus_set_bar0_window, | 528 | .set_bar0_window = gk20a_bus_set_bar0_window, |
529 | }, | 529 | }, |
530 | .ptimer = { | 530 | .ptimer = { |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index d6b305d4..450c9c87 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -476,7 +476,6 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
476 | .get_kind_invalid = gm20b_get_kind_invalid, | 476 | .get_kind_invalid = gm20b_get_kind_invalid, |
477 | .get_kind_pitch = gm20b_get_kind_pitch, | 477 | .get_kind_pitch = gm20b_get_kind_pitch, |
478 | .init_bar2_vm = gp10b_init_bar2_vm, | 478 | .init_bar2_vm = gp10b_init_bar2_vm, |
479 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | ||
480 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 479 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |
481 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 480 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |
482 | }, | 481 | }, |
@@ -575,6 +574,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
575 | .init_hw = gk20a_bus_init_hw, | 574 | .init_hw = gk20a_bus_init_hw, |
576 | .isr = gk20a_bus_isr, | 575 | .isr = gk20a_bus_isr, |
577 | .bar1_bind = NULL, | 576 | .bar1_bind = NULL, |
577 | .bar2_bind = NULL, | ||
578 | .set_bar0_window = gk20a_bus_set_bar0_window, | 578 | .set_bar0_window = gk20a_bus_set_bar0_window, |
579 | }, | 579 | }, |
580 | .ptimer = { | 580 | .ptimer = { |