diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 6ae743ef..2cde10ec 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -745,8 +745,9 @@ static u32 fecs_current_ctx_data(struct gk20a *g, struct nvgpu_mem *inst_block) | |||
745 | u64 ptr = nvgpu_inst_block_addr(g, inst_block) >> | 745 | u64 ptr = nvgpu_inst_block_addr(g, inst_block) >> |
746 | ram_in_base_shift_v(); | 746 | ram_in_base_shift_v(); |
747 | u32 aperture = nvgpu_aperture_mask(g, inst_block, | 747 | u32 aperture = nvgpu_aperture_mask(g, inst_block, |
748 | gr_fecs_current_ctx_target_sys_mem_ncoh_f(), | 748 | gr_fecs_current_ctx_target_sys_mem_ncoh_f(), |
749 | gr_fecs_current_ctx_target_vid_mem_f()); | 749 | gr_fecs_current_ctx_target_sys_mem_coh_f(), |
750 | gr_fecs_current_ctx_target_vid_mem_f()); | ||
750 | 751 | ||
751 | return gr_fecs_current_ctx_ptr_f(u64_lo32(ptr)) | aperture | | 752 | return gr_fecs_current_ctx_ptr_f(u64_lo32(ptr)) | aperture | |
752 | gr_fecs_current_ctx_valid_f(1); | 753 | gr_fecs_current_ctx_valid_f(1); |
@@ -2171,16 +2172,18 @@ void gr_gk20a_load_falcon_bind_instblk(struct gk20a *g) | |||
2171 | 2172 | ||
2172 | inst_ptr = nvgpu_inst_block_addr(g, &ucode_info->inst_blk_desc); | 2173 | inst_ptr = nvgpu_inst_block_addr(g, &ucode_info->inst_blk_desc); |
2173 | gk20a_writel(g, gr_fecs_new_ctx_r(), | 2174 | gk20a_writel(g, gr_fecs_new_ctx_r(), |
2174 | gr_fecs_new_ctx_ptr_f(inst_ptr >> 12) | | 2175 | gr_fecs_new_ctx_ptr_f(inst_ptr >> 12) | |
2175 | nvgpu_aperture_mask(g, &ucode_info->inst_blk_desc, | 2176 | nvgpu_aperture_mask(g, &ucode_info->inst_blk_desc, |
2176 | gr_fecs_new_ctx_target_sys_mem_ncoh_f(), | 2177 | gr_fecs_new_ctx_target_sys_mem_ncoh_f(), |
2178 | gr_fecs_new_ctx_target_sys_mem_coh_f(), | ||
2177 | gr_fecs_new_ctx_target_vid_mem_f()) | | 2179 | gr_fecs_new_ctx_target_vid_mem_f()) | |
2178 | gr_fecs_new_ctx_valid_m()); | 2180 | gr_fecs_new_ctx_valid_m()); |
2179 | 2181 | ||
2180 | gk20a_writel(g, gr_fecs_arb_ctx_ptr_r(), | 2182 | gk20a_writel(g, gr_fecs_arb_ctx_ptr_r(), |
2181 | gr_fecs_arb_ctx_ptr_ptr_f(inst_ptr >> 12) | | 2183 | gr_fecs_arb_ctx_ptr_ptr_f(inst_ptr >> 12) | |
2182 | nvgpu_aperture_mask(g, &ucode_info->inst_blk_desc, | 2184 | nvgpu_aperture_mask(g, &ucode_info->inst_blk_desc, |
2183 | gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(), | 2185 | gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(), |
2186 | gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(), | ||
2184 | gr_fecs_arb_ctx_ptr_target_vid_mem_f())); | 2187 | gr_fecs_arb_ctx_ptr_target_vid_mem_f())); |
2185 | 2188 | ||
2186 | gk20a_writel(g, gr_fecs_arb_ctx_cmd_r(), 0x7); | 2189 | gk20a_writel(g, gr_fecs_arb_ctx_cmd_r(), 0x7); |
@@ -4379,8 +4382,9 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g) | |||
4379 | 4382 | ||
4380 | gk20a_writel(g, fb_mmu_debug_wr_r(), | 4383 | gk20a_writel(g, fb_mmu_debug_wr_r(), |
4381 | nvgpu_aperture_mask(g, &gr->mmu_wr_mem, | 4384 | nvgpu_aperture_mask(g, &gr->mmu_wr_mem, |
4382 | fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(), | 4385 | fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(), |
4383 | fb_mmu_debug_wr_aperture_vid_mem_f()) | | 4386 | fb_mmu_debug_wr_aperture_sys_mem_coh_f(), |
4387 | fb_mmu_debug_wr_aperture_vid_mem_f()) | | ||
4384 | fb_mmu_debug_wr_vol_false_f() | | 4388 | fb_mmu_debug_wr_vol_false_f() | |
4385 | fb_mmu_debug_wr_addr_f(addr)); | 4389 | fb_mmu_debug_wr_addr_f(addr)); |
4386 | 4390 | ||
@@ -4389,8 +4393,9 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g) | |||
4389 | 4393 | ||
4390 | gk20a_writel(g, fb_mmu_debug_rd_r(), | 4394 | gk20a_writel(g, fb_mmu_debug_rd_r(), |
4391 | nvgpu_aperture_mask(g, &gr->mmu_rd_mem, | 4395 | nvgpu_aperture_mask(g, &gr->mmu_rd_mem, |
4392 | fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(), | 4396 | fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(), |
4393 | fb_mmu_debug_rd_aperture_vid_mem_f()) | | 4397 | fb_mmu_debug_wr_aperture_sys_mem_coh_f(), |
4398 | fb_mmu_debug_rd_aperture_vid_mem_f()) | | ||
4394 | fb_mmu_debug_rd_vol_false_f() | | 4399 | fb_mmu_debug_rd_vol_false_f() | |
4395 | fb_mmu_debug_rd_addr_f(addr)); | 4400 | fb_mmu_debug_rd_addr_f(addr)); |
4396 | 4401 | ||