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>

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 = {
                 .is_bar1_supported = gv11b_mm_is_bar1_supported,
                 .init_inst_block = gv11b_init_inst_block,
                 .mmu_fault_pending = gv11b_mm_mmu_fault_pending,
+                .get_kind_invalid = gm20b_get_kind_invalid,
+                .get_kind_pitch = gm20b_get_kind_pitch,
                 .init_bar2_vm = gb10b_init_bar2_vm,
                 .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup,
                 .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 = {
                 .is_bar1_supported = gv11b_mm_is_bar1_supported,
                 .init_inst_block = gv11b_init_inst_block,
                 .mmu_fault_pending = gv11b_mm_mmu_fault_pending,
+                .get_kind_invalid = gm20b_get_kind_invalid,
+                .get_kind_pitch = gm20b_get_kind_pitch,
                 .init_bar2_vm = gb10b_init_bar2_vm,
                 .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup,
                 .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 = {
                 .is_bar1_supported = gv11b_mm_is_bar1_supported,
                 .init_inst_block = gv11b_init_inst_block,
                 .mmu_fault_pending = gv11b_mm_mmu_fault_pending,
+                .get_kind_invalid = gm20b_get_kind_invalid,
+                .get_kind_pitch = gm20b_get_kind_pitch,
                 .init_bar2_vm = gb10b_init_bar2_vm,
                 .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup,
                 .remove_bar2_vm = gv11b_mm_remove_bar2_vm,