diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-10-16 15:38:46 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-18 19:01:08 -0400 |
commit | 62e133029d5a89e07e3ba5e96475c0960c0bc3dd (patch) | |
tree | 9e6cba4181f90d4abcb6b303448993c75cd8f273 | |
parent | 201ccbfa8503daee9562a22f50a5b626fe4cc6a1 (diff) |
gpu: nvgpu: Refactoring nvgpu_vm functions
Change required for equivalent change on nvgpu. This is required
since a few HALs were added that must be populated for all chips.
This patch adds those HAL definitions for gv11b, gv100, and the
vgpu.
JIRA NVGPU-30
JIRA NVGPU-138
Change-Id: I65374764350a5cacce8624b15d98947fada35a4a
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1579865
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-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/vgpu/gv11b/vgpu_hal_gv11b.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 2ece7be8..9d033d6d 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -535,6 +535,8 @@ static const struct gpu_ops gv100_ops = { | |||
535 | .is_bar1_supported = gv11b_mm_is_bar1_supported, | 535 | .is_bar1_supported = gv11b_mm_is_bar1_supported, |
536 | .init_inst_block = gv11b_init_inst_block, | 536 | .init_inst_block = gv11b_init_inst_block, |
537 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, | 537 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, |
538 | .get_kind_invalid = gm20b_get_kind_invalid, | ||
539 | .get_kind_pitch = gm20b_get_kind_pitch, | ||
538 | .init_bar2_vm = gb10b_init_bar2_vm, | 540 | .init_bar2_vm = gb10b_init_bar2_vm, |
539 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | 541 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, |
540 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 542 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index e7e2be54..328398d9 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -549,6 +549,8 @@ static const struct gpu_ops gv11b_ops = { | |||
549 | .is_bar1_supported = gv11b_mm_is_bar1_supported, | 549 | .is_bar1_supported = gv11b_mm_is_bar1_supported, |
550 | .init_inst_block = gv11b_init_inst_block, | 550 | .init_inst_block = gv11b_init_inst_block, |
551 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, | 551 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, |
552 | .get_kind_invalid = gm20b_get_kind_invalid, | ||
553 | .get_kind_pitch = gm20b_get_kind_pitch, | ||
552 | .init_bar2_vm = gb10b_init_bar2_vm, | 554 | .init_bar2_vm = gb10b_init_bar2_vm, |
553 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | 555 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, |
554 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 556 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index aa661d66..80ed59a2 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -436,6 +436,8 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
436 | .is_bar1_supported = gv11b_mm_is_bar1_supported, | 436 | .is_bar1_supported = gv11b_mm_is_bar1_supported, |
437 | .init_inst_block = gv11b_init_inst_block, | 437 | .init_inst_block = gv11b_init_inst_block, |
438 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, | 438 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, |
439 | .get_kind_invalid = gm20b_get_kind_invalid, | ||
440 | .get_kind_pitch = gm20b_get_kind_pitch, | ||
439 | .init_bar2_vm = gb10b_init_bar2_vm, | 441 | .init_bar2_vm = gb10b_init_bar2_vm, |
440 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | 442 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, |
441 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 443 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |