diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index 00db510a..26306efc 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -35,8 +35,8 @@ static void channel_gm20b_bind(struct channel_gk20a *c) | |||
35 | 35 | ||
36 | gk20a_writel(g, ccsr_channel_inst_r(c->hw_chid), | 36 | gk20a_writel(g, ccsr_channel_inst_r(c->hw_chid), |
37 | ccsr_channel_inst_ptr_f(inst_ptr) | | 37 | ccsr_channel_inst_ptr_f(inst_ptr) | |
38 | (g->mm.vidmem_is_vidmem ? | 38 | gk20a_aperture_mask(g, &c->inst_block, |
39 | ccsr_channel_inst_target_sys_mem_ncoh_f() : | 39 | ccsr_channel_inst_target_sys_mem_ncoh_f(), |
40 | ccsr_channel_inst_target_vid_mem_f()) | | 40 | ccsr_channel_inst_target_vid_mem_f()) | |
41 | ccsr_channel_inst_bind_true_f()); | 41 | ccsr_channel_inst_bind_true_f()); |
42 | 42 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index 726d73ed..8aa14662 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c | |||
@@ -135,18 +135,20 @@ static bool gm20b_mm_support_sparse(struct gk20a *g) | |||
135 | return true; | 135 | return true; |
136 | } | 136 | } |
137 | 137 | ||
138 | static int gm20b_mm_bar1_bind(struct gk20a *g, u64 bar1_iova) | 138 | static int gm20b_mm_bar1_bind(struct gk20a *g, struct mem_desc *bar1_inst) |
139 | { | 139 | { |
140 | int retry = 1000; | 140 | int retry = 1000; |
141 | u64 inst_pa = (u32)(bar1_iova >> bar1_instance_block_shift_gk20a()); | 141 | u64 iova = gk20a_mm_inst_block_addr(g, bar1_inst); |
142 | gk20a_dbg_info("bar1 inst block ptr: 0x%08x", (u32)inst_pa); | 142 | u32 ptr_v = (u32)(iova >> bar1_instance_block_shift_gk20a()); |
143 | |||
144 | gk20a_dbg_info("bar1 inst block ptr: 0x%08x", ptr_v); | ||
143 | 145 | ||
144 | gk20a_writel(g, bus_bar1_block_r(), | 146 | gk20a_writel(g, bus_bar1_block_r(), |
145 | (g->mm.vidmem_is_vidmem ? | 147 | gk20a_aperture_mask(g, bar1_inst, |
146 | bus_bar1_block_target_sys_mem_ncoh_f() : | 148 | bus_bar1_block_target_sys_mem_ncoh_f(), |
147 | bus_bar1_block_target_vid_mem_f()) | | 149 | bus_bar1_block_target_vid_mem_f()) | |
148 | bus_bar1_block_mode_virtual_f() | | 150 | bus_bar1_block_mode_virtual_f() | |
149 | bus_bar1_block_ptr_f(inst_pa)); | 151 | bus_bar1_block_ptr_f(ptr_v)); |
150 | do { | 152 | do { |
151 | u32 val = gk20a_readl(g, bus_bind_status_r()); | 153 | u32 val = gk20a_readl(g, bus_bind_status_r()); |
152 | u32 pending = bus_bind_status_bar1_pending_v(val); | 154 | u32 pending = bus_bind_status_bar1_pending_v(val); |