summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-05-25 13:43:01 -0400
committerTejal Kudav <tkudav@nvidia.com>2018-06-14 09:44:07 -0400
commitd4dfa63e6c324430ad2cac4fabb73a95858b2573 (patch)
tree1a4816e148827901ac1d23a6fbdf2729d1633469 /drivers/gpu/nvgpu/gp106
parent27694ca572c4d7698b107c6713f0f0604b41c186 (diff)
gpu: nvgpu: Combine variants of init_mm_setup_hw
gp10b and gk20a variants of init_mm_setup_hw were essentially the same. Delete the gp10b version and use gk20a variant instead. gv11b variant now also inherits gk20a variant. JIRA NVGPU-588 Change-Id: I842516a1c0be68562ad0ece6e1837a1416d24957 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1730897 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index f35abac7..67a7968a 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -578,7 +578,7 @@ static const struct gpu_ops gp106_ops = {
578 .gpu_phys_addr = gm20b_gpu_phys_addr, 578 .gpu_phys_addr = gm20b_gpu_phys_addr,
579 .get_mmu_levels = gp10b_mm_get_mmu_levels, 579 .get_mmu_levels = gp10b_mm_get_mmu_levels,
580 .init_pdb = gp10b_mm_init_pdb, 580 .init_pdb = gp10b_mm_init_pdb,
581 .init_mm_setup_hw = gp10b_init_mm_setup_hw, 581 .init_mm_setup_hw = gk20a_init_mm_setup_hw,
582 .is_bar1_supported = gm20b_mm_is_bar1_supported, 582 .is_bar1_supported = gm20b_mm_is_bar1_supported,
583 .alloc_inst_block = gk20a_alloc_inst_block, 583 .alloc_inst_block = gk20a_alloc_inst_block,
584 .init_inst_block = gk20a_init_inst_block, 584 .init_inst_block = gk20a_init_inst_block,