diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index a2b2e53f..49f2a34a 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -368,8 +368,8 @@ struct gpu_ops { | |||
368 | void (*enable_exceptions)(struct gk20a *g); | 368 | void (*enable_exceptions)(struct gk20a *g); |
369 | void (*create_gr_sysfs)(struct gk20a *g); | 369 | void (*create_gr_sysfs)(struct gk20a *g); |
370 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); | 370 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); |
371 | int (*record_sm_error_state)(struct gk20a *g, u32 gpc, | 371 | int (*record_sm_error_state)(struct gk20a *g, u32 gpc, u32 tpc, |
372 | u32 tpc, struct channel_gk20a *fault_ch); | 372 | u32 sm, struct channel_gk20a *fault_ch); |
373 | int (*update_sm_error_state)(struct gk20a *g, | 373 | int (*update_sm_error_state)(struct gk20a *g, |
374 | struct channel_gk20a *ch, u32 sm_id, | 374 | struct channel_gk20a *ch, u32 sm_id, |
375 | struct nvgpu_gr_sm_error_state *sm_error_state); | 375 | struct nvgpu_gr_sm_error_state *sm_error_state); |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 37ac8748..a082cd92 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -5608,7 +5608,7 @@ int gr_gk20a_handle_sm_exception(struct gk20a *g, u32 gpc, u32 tpc, u32 sm, | |||
5608 | "sm hww global 0x%08x warp 0x%08x", global_esr, warp_esr); | 5608 | "sm hww global 0x%08x warp 0x%08x", global_esr, warp_esr); |
5609 | 5609 | ||
5610 | gr_gk20a_elpg_protected_call(g, | 5610 | gr_gk20a_elpg_protected_call(g, |
5611 | g->ops.gr.record_sm_error_state(g, gpc, tpc, fault_ch)); | 5611 | g->ops.gr.record_sm_error_state(g, gpc, tpc, sm, fault_ch)); |
5612 | 5612 | ||
5613 | if (g->ops.gr.pre_process_sm_exception) { | 5613 | if (g->ops.gr.pre_process_sm_exception) { |
5614 | ret = g->ops.gr.pre_process_sm_exception(g, gpc, tpc, sm, | 5614 | ret = g->ops.gr.pre_process_sm_exception(g, gpc, tpc, sm, |