summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 47659445..88e3f60a 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -646,7 +646,7 @@ channel_from_inst_ptr(struct fifo_gk20a *f, u64 inst_ptr)
646 for (ci = 0; ci < f->num_channels; ci++) { 646 for (ci = 0; ci < f->num_channels; ci++) {
647 struct channel_gk20a *c = f->channel+ci; 647 struct channel_gk20a *c = f->channel+ci;
648 if (c->inst_block.cpu_va && 648 if (c->inst_block.cpu_va &&
649 (inst_ptr == sg_phys(c->inst_block.sgt->sgl))) 649 (inst_ptr == gk20a_mem_phys(&c->inst_block)))
650 return f->channel+ci; 650 return f->channel+ci;
651 } 651 }
652 return NULL; 652 return NULL;
@@ -1002,10 +1002,10 @@ static bool gk20a_fifo_handle_mmu_fault(struct gk20a *g)
1002 gk20a_fifo_set_ctx_mmu_error_ch(g, ch); 1002 gk20a_fifo_set_ctx_mmu_error_ch(g, ch);
1003 gk20a_channel_abort(ch); 1003 gk20a_channel_abort(ch);
1004 } else if (f.inst_ptr == 1004 } else if (f.inst_ptr ==
1005 sg_phys(g->mm.bar1.inst_block.sgt->sgl)) { 1005 gk20a_mem_phys(&g->mm.bar1.inst_block)) {
1006 gk20a_err(dev_from_gk20a(g), "mmu fault from bar1"); 1006 gk20a_err(dev_from_gk20a(g), "mmu fault from bar1");
1007 } else if (f.inst_ptr == 1007 } else if (f.inst_ptr ==
1008 sg_phys(g->mm.pmu.inst_block.sgt->sgl)) { 1008 gk20a_mem_phys(&g->mm.pmu.inst_block)) {
1009 gk20a_err(dev_from_gk20a(g), "mmu fault from pmu"); 1009 gk20a_err(dev_from_gk20a(g), "mmu fault from pmu");
1010 } else 1010 } else
1011 gk20a_err(dev_from_gk20a(g), "couldn't locate channel for mmu fault"); 1011 gk20a_err(dev_from_gk20a(g), "couldn't locate channel for mmu fault");