diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c index 3f99eb9e..5b8307e5 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -388,8 +388,8 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
388 | .is_bar1_supported = gm20b_mm_is_bar1_supported, | 388 | .is_bar1_supported = gm20b_mm_is_bar1_supported, |
389 | .init_inst_block = gk20a_init_inst_block, | 389 | .init_inst_block = gk20a_init_inst_block, |
390 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, | 390 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, |
391 | .init_bar2_vm = gb10b_init_bar2_vm, | 391 | .init_bar2_vm = gp10b_init_bar2_vm, |
392 | .init_bar2_mm_hw_setup = gb10b_init_bar2_mm_hw_setup, | 392 | .init_bar2_mm_hw_setup = gp10b_init_bar2_mm_hw_setup, |
393 | .remove_bar2_vm = gp10b_remove_bar2_vm, | 393 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
394 | .get_kind_invalid = gm20b_get_kind_invalid, | 394 | .get_kind_invalid = gm20b_get_kind_invalid, |
395 | .get_kind_pitch = gm20b_get_kind_pitch, | 395 | .get_kind_pitch = gm20b_get_kind_pitch, |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c index c8752f91..0813ad75 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -438,7 +438,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
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, | 439 | .get_kind_invalid = gm20b_get_kind_invalid, |
440 | .get_kind_pitch = gm20b_get_kind_pitch, | 440 | .get_kind_pitch = gm20b_get_kind_pitch, |
441 | .init_bar2_vm = gb10b_init_bar2_vm, | 441 | .init_bar2_vm = gp10b_init_bar2_vm, |
442 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | 442 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, |
443 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 443 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |
444 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 444 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index d0458420..bd02f914 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -540,8 +540,8 @@ static const struct gpu_ops gp106_ops = { | |||
540 | .alloc_inst_block = gk20a_alloc_inst_block, | 540 | .alloc_inst_block = gk20a_alloc_inst_block, |
541 | .init_inst_block = gk20a_init_inst_block, | 541 | .init_inst_block = gk20a_init_inst_block, |
542 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, | 542 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, |
543 | .init_bar2_vm = gb10b_init_bar2_vm, | 543 | .init_bar2_vm = gp10b_init_bar2_vm, |
544 | .init_bar2_mm_hw_setup = gb10b_init_bar2_mm_hw_setup, | 544 | .init_bar2_mm_hw_setup = gp10b_init_bar2_mm_hw_setup, |
545 | .remove_bar2_vm = gp10b_remove_bar2_vm, | 545 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
546 | .get_vidmem_size = gp106_mm_get_vidmem_size, | 546 | .get_vidmem_size = gp106_mm_get_vidmem_size, |
547 | .get_kind_invalid = gm20b_get_kind_invalid, | 547 | .get_kind_invalid = gm20b_get_kind_invalid, |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 5e9096e2..a5b42565 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -515,8 +515,8 @@ static const struct gpu_ops gp10b_ops = { | |||
515 | .alloc_inst_block = gk20a_alloc_inst_block, | 515 | .alloc_inst_block = gk20a_alloc_inst_block, |
516 | .init_inst_block = gk20a_init_inst_block, | 516 | .init_inst_block = gk20a_init_inst_block, |
517 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, | 517 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, |
518 | .init_bar2_vm = gb10b_init_bar2_vm, | 518 | .init_bar2_vm = gp10b_init_bar2_vm, |
519 | .init_bar2_mm_hw_setup = gb10b_init_bar2_mm_hw_setup, | 519 | .init_bar2_mm_hw_setup = gp10b_init_bar2_mm_hw_setup, |
520 | .remove_bar2_vm = gp10b_remove_bar2_vm, | 520 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
521 | .get_kind_invalid = gm20b_get_kind_invalid, | 521 | .get_kind_invalid = gm20b_get_kind_invalid, |
522 | .get_kind_pitch = gm20b_get_kind_pitch, | 522 | .get_kind_pitch = gm20b_get_kind_pitch, |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index 33591edc..a9308b6e 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -78,7 +78,7 @@ int gp10b_init_mm_setup_hw(struct gk20a *g) | |||
78 | 78 | ||
79 | } | 79 | } |
80 | 80 | ||
81 | int gb10b_init_bar2_vm(struct gk20a *g) | 81 | int gp10b_init_bar2_vm(struct gk20a *g) |
82 | { | 82 | { |
83 | int err; | 83 | int err; |
84 | struct mm_gk20a *mm = &g->mm; | 84 | struct mm_gk20a *mm = &g->mm; |
@@ -109,7 +109,7 @@ clean_up_va: | |||
109 | return err; | 109 | return err; |
110 | } | 110 | } |
111 | 111 | ||
112 | int gb10b_init_bar2_mm_hw_setup(struct gk20a *g) | 112 | int gp10b_init_bar2_mm_hw_setup(struct gk20a *g) |
113 | { | 113 | { |
114 | struct mm_gk20a *mm = &g->mm; | 114 | struct mm_gk20a *mm = &g->mm; |
115 | struct nvgpu_mem *inst_block = &mm->bar2.inst_block; | 115 | struct nvgpu_mem *inst_block = &mm->bar2.inst_block; |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h index b6bcb04a..5522d02e 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h | |||
@@ -31,8 +31,8 @@ struct vm_gk20a; | |||
31 | u32 gp10b_mm_get_default_big_page_size(void); | 31 | u32 gp10b_mm_get_default_big_page_size(void); |
32 | u32 gp10b_mm_get_iommu_bit(struct gk20a *g); | 32 | u32 gp10b_mm_get_iommu_bit(struct gk20a *g); |
33 | int gp10b_init_mm_setup_hw(struct gk20a *g); | 33 | int gp10b_init_mm_setup_hw(struct gk20a *g); |
34 | int gb10b_init_bar2_vm(struct gk20a *g); | 34 | int gp10b_init_bar2_vm(struct gk20a *g); |
35 | int gb10b_init_bar2_mm_hw_setup(struct gk20a *g); | 35 | int gp10b_init_bar2_mm_hw_setup(struct gk20a *g); |
36 | const struct gk20a_mmu_level *gp10b_mm_get_mmu_levels(struct gk20a *g, | 36 | const struct gk20a_mmu_level *gp10b_mm_get_mmu_levels(struct gk20a *g, |
37 | u32 big_page_size); | 37 | u32 big_page_size); |
38 | void gp10b_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *inst_block, | 38 | void gp10b_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *inst_block, |
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index dbf32b20..0768ed0c 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -559,7 +559,7 @@ static const struct gpu_ops gv100_ops = { | |||
559 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, | 559 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, |
560 | .get_kind_invalid = gm20b_get_kind_invalid, | 560 | .get_kind_invalid = gm20b_get_kind_invalid, |
561 | .get_kind_pitch = gm20b_get_kind_pitch, | 561 | .get_kind_pitch = gm20b_get_kind_pitch, |
562 | .init_bar2_vm = gb10b_init_bar2_vm, | 562 | .init_bar2_vm = gp10b_init_bar2_vm, |
563 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | 563 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, |
564 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 564 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |
565 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 565 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 80ed29b8..482c1eec 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -583,7 +583,7 @@ static const struct gpu_ops gv11b_ops = { | |||
583 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, | 583 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, |
584 | .get_kind_invalid = gm20b_get_kind_invalid, | 584 | .get_kind_invalid = gm20b_get_kind_invalid, |
585 | .get_kind_pitch = gm20b_get_kind_pitch, | 585 | .get_kind_pitch = gm20b_get_kind_pitch, |
586 | .init_bar2_vm = gb10b_init_bar2_vm, | 586 | .init_bar2_vm = gp10b_init_bar2_vm, |
587 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | 587 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, |
588 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | 588 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, |
589 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | 589 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, |