diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2016-09-06 06:43:31 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:19 -0500 |
commit | bb6923908a2873b079ad67d22c9fcb014c00af28 (patch) | |
tree | 94a990e130547150ea61d5d476fb14633784984c /drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |
parent | 5544272474d7b1e3103eed76fbaf91ba7a739345 (diff) |
gpu: nvgpu: select target based on aperture
For bar2 and pmu instance blocks, use gk20a_aperture_mask()
to select target address (i.e. if address is in sysmem or
vidmem) based on aperture
Also add target accessors for gr_fecs_new_ctx and
gr_fecs_arb_ctx_ptr
Jira DNVGPU-22
Change-Id: Ieaa80bd83a4191fe57b7fba6e0f9cdaeb195a077
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1216138
(cherry picked from commit 7a9f4175abc5dddf0879215de4637b7b6eb0ab7b)
Reviewed-on: http://git-master/r/1219712
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/mm_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index c9da4c93..048a4662 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -105,9 +105,9 @@ static int gb10b_init_bar2_mm_hw_setup(struct gk20a *g) | |||
105 | gk20a_dbg_info("bar2 inst block ptr: 0x%08x", (u32)inst_pa); | 105 | gk20a_dbg_info("bar2 inst block ptr: 0x%08x", (u32)inst_pa); |
106 | 106 | ||
107 | gk20a_writel(g, bus_bar2_block_r(), | 107 | gk20a_writel(g, bus_bar2_block_r(), |
108 | (g->mm.vidmem_is_vidmem ? | 108 | gk20a_aperture_mask(g, inst_block, |
109 | bus_bar2_block_target_sys_mem_ncoh_f() : | 109 | bus_bar2_block_target_sys_mem_ncoh_f(), |
110 | bus_bar2_block_target_vid_mem_f()) | | 110 | bus_bar2_block_target_vid_mem_f()) | |
111 | bus_bar2_block_mode_virtual_f() | | 111 | bus_bar2_block_mode_virtual_f() | |
112 | bus_bar2_block_ptr_f(inst_pa)); | 112 | bus_bar2_block_ptr_f(inst_pa)); |
113 | 113 | ||