diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/fb')
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv11b.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c index cf70b64d..e6996321 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -46,7 +46,6 @@ | |||
46 | 46 | ||
47 | #include <nvgpu/hw/gv11b/hw_fb_gv11b.h> | 47 | #include <nvgpu/hw/gv11b/hw_fb_gv11b.h> |
48 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | 48 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> |
49 | #include <nvgpu/hw/gv11b/hw_ram_gv11b.h> | ||
50 | #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h> | 49 | #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h> |
51 | 50 | ||
52 | static int gv11b_fb_fix_page_fault(struct gk20a *g, | 51 | static int gv11b_fb_fix_page_fault(struct gk20a *g, |
@@ -375,7 +374,7 @@ void gv11b_fb_fault_buf_configure_hw(struct gk20a *g, u32 index) | |||
375 | gv11b_fb_fault_buf_set_state_hw(g, index, | 374 | gv11b_fb_fault_buf_set_state_hw(g, index, |
376 | NVGPU_FB_MMU_FAULT_BUF_DISABLED); | 375 | NVGPU_FB_MMU_FAULT_BUF_DISABLED); |
377 | addr_lo = u64_lo32(g->mm.hw_fault_buf[index].gpu_va >> | 376 | addr_lo = u64_lo32(g->mm.hw_fault_buf[index].gpu_va >> |
378 | ram_in_base_shift_v()); | 377 | fb_mmu_fault_buffer_lo_addr_b()); |
379 | addr_hi = u64_hi32(g->mm.hw_fault_buf[index].gpu_va); | 378 | addr_hi = u64_hi32(g->mm.hw_fault_buf[index].gpu_va); |
380 | 379 | ||
381 | g->ops.fb.write_mmu_fault_buffer_lo_hi(g, index, | 380 | g->ops.fb.write_mmu_fault_buffer_lo_hi(g, index, |
@@ -749,7 +748,7 @@ static void gv11b_fb_copy_from_hw_fault_buf(struct gk20a *g, | |||
749 | rd32_val = nvgpu_mem_rd32(g, mem, offset + | 748 | rd32_val = nvgpu_mem_rd32(g, mem, offset + |
750 | gmmu_fault_buf_entry_inst_lo_w()); | 749 | gmmu_fault_buf_entry_inst_lo_w()); |
751 | addr_lo = gmmu_fault_buf_entry_inst_lo_v(rd32_val); | 750 | addr_lo = gmmu_fault_buf_entry_inst_lo_v(rd32_val); |
752 | addr_lo = addr_lo << ram_in_base_shift_v(); | 751 | addr_lo = addr_lo << gmmu_fault_buf_entry_inst_lo_b(); |
753 | 752 | ||
754 | addr_hi = nvgpu_mem_rd32(g, mem, offset + | 753 | addr_hi = nvgpu_mem_rd32(g, mem, offset + |
755 | gmmu_fault_buf_entry_inst_hi_w()); | 754 | gmmu_fault_buf_entry_inst_hi_w()); |
@@ -775,7 +774,7 @@ static void gv11b_fb_copy_from_hw_fault_buf(struct gk20a *g, | |||
775 | mmfault->fault_addr_aperture = | 774 | mmfault->fault_addr_aperture = |
776 | gmmu_fault_buf_entry_addr_phys_aperture_v(rd32_val); | 775 | gmmu_fault_buf_entry_addr_phys_aperture_v(rd32_val); |
777 | addr_lo = gmmu_fault_buf_entry_addr_lo_v(rd32_val); | 776 | addr_lo = gmmu_fault_buf_entry_addr_lo_v(rd32_val); |
778 | addr_lo = addr_lo << ram_in_base_shift_v(); | 777 | addr_lo = addr_lo << gmmu_fault_buf_entry_addr_lo_b(); |
779 | 778 | ||
780 | rd32_val = nvgpu_mem_rd32(g, mem, offset + | 779 | rd32_val = nvgpu_mem_rd32(g, mem, offset + |
781 | gmmu_fault_buf_entry_addr_hi_w()); | 780 | gmmu_fault_buf_entry_addr_hi_w()); |
@@ -1096,7 +1095,7 @@ static void gv11b_mm_copy_from_fault_snap_reg(struct gk20a *g, | |||
1096 | g->ops.fb.read_mmu_fault_inst_lo_hi(g, ®_val, &addr_hi); | 1095 | g->ops.fb.read_mmu_fault_inst_lo_hi(g, ®_val, &addr_hi); |
1097 | 1096 | ||
1098 | addr_lo = fb_mmu_fault_inst_lo_addr_v(reg_val); | 1097 | addr_lo = fb_mmu_fault_inst_lo_addr_v(reg_val); |
1099 | addr_lo = addr_lo << ram_in_base_shift_v(); | 1098 | addr_lo = addr_lo << fb_mmu_fault_inst_lo_addr_b(); |
1100 | 1099 | ||
1101 | addr_hi = fb_mmu_fault_inst_hi_addr_v(addr_hi); | 1100 | addr_hi = fb_mmu_fault_inst_hi_addr_v(addr_hi); |
1102 | inst_ptr = hi32_lo32_to_u64(addr_hi, addr_lo); | 1101 | inst_ptr = hi32_lo32_to_u64(addr_hi, addr_lo); |
@@ -1121,7 +1120,7 @@ static void gv11b_mm_copy_from_fault_snap_reg(struct gk20a *g, | |||
1121 | g->ops.fb.read_mmu_fault_addr_lo_hi(g, ®_val, &addr_hi); | 1120 | g->ops.fb.read_mmu_fault_addr_lo_hi(g, ®_val, &addr_hi); |
1122 | 1121 | ||
1123 | addr_lo = fb_mmu_fault_addr_lo_addr_v(reg_val); | 1122 | addr_lo = fb_mmu_fault_addr_lo_addr_v(reg_val); |
1124 | addr_lo = addr_lo << ram_in_base_shift_v(); | 1123 | addr_lo = addr_lo << fb_mmu_fault_addr_lo_addr_b(); |
1125 | 1124 | ||
1126 | mmfault->fault_addr_aperture = | 1125 | mmfault->fault_addr_aperture = |
1127 | fb_mmu_fault_addr_lo_phys_aperture_v(reg_val); | 1126 | fb_mmu_fault_addr_lo_phys_aperture_v(reg_val); |