summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/common/mc/mc_gp10b.c4
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/gk20a.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/mc/mc_gp10b.c b/drivers/gpu/nvgpu/common/mc/mc_gp10b.c
index a0f26dd3..3dce9a09 100644
--- a/drivers/gpu/nvgpu/common/mc/mc_gp10b.c
+++ b/drivers/gpu/nvgpu/common/mc/mc_gp10b.c
@@ -144,8 +144,8 @@ void mc_gp10b_isr_stall(struct gk20a *g)
144 g->ops.mc.is_intr_nvlink_pending(g, mc_intr_0)) { 144 g->ops.mc.is_intr_nvlink_pending(g, mc_intr_0)) {
145 g->ops.nvlink.isr(g); 145 g->ops.nvlink.isr(g);
146 } 146 }
147 if (mc_intr_0 & mc_intr_pfb_pending_f() && g->ops.fb.fbpa_isr) { 147 if (mc_intr_0 & mc_intr_pfb_pending_f() && g->ops.mc.fbpa_isr) {
148 g->ops.fb.fbpa_isr(g); 148 g->ops.mc.fbpa_isr(g);
149 } 149 }
150 150
151 nvgpu_log(g, gpu_dbg_intr, "stall intr done 0x%08x\n", mc_intr_0); 151 nvgpu_log(g, gpu_dbg_intr, "stall intr done 0x%08x\n", mc_intr_0);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 56b14245..0230709c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -560,7 +560,7 @@ struct gpu_ops {
560 void (*enable_hub_intr)(struct gk20a *g); 560 void (*enable_hub_intr)(struct gk20a *g);
561 void (*disable_hub_intr)(struct gk20a *g); 561 void (*disable_hub_intr)(struct gk20a *g);
562 int (*init_fbpa)(struct gk20a *g); 562 int (*init_fbpa)(struct gk20a *g);
563 void (*fbpa_isr)(struct gk20a *g); 563 void (*handle_fbpa_intr)(struct gk20a *g, u32 fbpa_id);
564 void (*write_mmu_fault_buffer_lo_hi)(struct gk20a *g, u32 index, 564 void (*write_mmu_fault_buffer_lo_hi)(struct gk20a *g, u32 index,
565 u32 addr_lo, u32 addr_hi); 565 u32 addr_lo, u32 addr_hi);
566 void (*write_mmu_fault_buffer_get)(struct gk20a *g, u32 index, 566 void (*write_mmu_fault_buffer_get)(struct gk20a *g, u32 index,
@@ -1168,6 +1168,7 @@ struct gpu_ops {
1168 void (*reset)(struct gk20a *g, u32 units); 1168 void (*reset)(struct gk20a *g, u32 units);
1169 bool (*is_intr1_pending)(struct gk20a *g, enum nvgpu_unit unit, u32 mc_intr_1); 1169 bool (*is_intr1_pending)(struct gk20a *g, enum nvgpu_unit unit, u32 mc_intr_1);
1170 void (*log_pending_intrs)(struct gk20a *g); 1170 void (*log_pending_intrs)(struct gk20a *g);
1171 void (*fbpa_isr)(struct gk20a *g);
1171 } mc; 1172 } mc;
1172 struct { 1173 struct {
1173 void (*show_dump)(struct gk20a *g, 1174 void (*show_dump)(struct gk20a *g,