diff options
author | Shashank Singh <shashsingh@nvidia.com> | 2018-02-21 01:44:07 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-13 17:09:33 -0400 |
commit | 23a855b8527e07c047a7c4d3671f39142d9ea432 (patch) | |
tree | 85c07850ac269400b3af8c6479b7054d159e15c1 /drivers/gpu/nvgpu/gk20a | |
parent | 663e941eb6382f60e3f468d645e256cb33c4e055 (diff) |
gpu: nvgpu: add fault_ch to record_sm_error_state
fault_ch is needed by rm-server to send the notification to guest VM.
rm-server is going to use gr sources from linux
Jira VQRM-2982
Change-Id: Ifb6e8a9630a471d07b89ffaa7f2ceb309220fd21
Signed-off-by: Shashank Singh <shashsingh@nvidia.com>
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1661665
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
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 ea55c664..9a0cfd02 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -365,8 +365,8 @@ struct gpu_ops { | |||
365 | void (*enable_exceptions)(struct gk20a *g); | 365 | void (*enable_exceptions)(struct gk20a *g); |
366 | void (*create_gr_sysfs)(struct gk20a *g); | 366 | void (*create_gr_sysfs)(struct gk20a *g); |
367 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); | 367 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); |
368 | int (*record_sm_error_state)(struct gk20a *g, | 368 | int (*record_sm_error_state)(struct gk20a *g, u32 gpc, |
369 | u32 gpc, u32 tpc); | 369 | u32 tpc, struct channel_gk20a *fault_ch); |
370 | int (*update_sm_error_state)(struct gk20a *g, | 370 | int (*update_sm_error_state)(struct gk20a *g, |
371 | struct channel_gk20a *ch, u32 sm_id, | 371 | struct channel_gk20a *ch, u32 sm_id, |
372 | struct nvgpu_gr_sm_error_state *sm_error_state); | 372 | 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 8a3f98af..a02c0e5d 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -5605,7 +5605,7 @@ int gr_gk20a_handle_sm_exception(struct gk20a *g, u32 gpc, u32 tpc, u32 sm, | |||
5605 | "sm hww global 0x%08x warp 0x%08x", global_esr, warp_esr); | 5605 | "sm hww global 0x%08x warp 0x%08x", global_esr, warp_esr); |
5606 | 5606 | ||
5607 | gr_gk20a_elpg_protected_call(g, | 5607 | gr_gk20a_elpg_protected_call(g, |
5608 | g->ops.gr.record_sm_error_state(g, gpc, tpc)); | 5608 | g->ops.gr.record_sm_error_state(g, gpc, tpc, fault_ch)); |
5609 | 5609 | ||
5610 | if (g->ops.gr.pre_process_sm_exception) { | 5610 | if (g->ops.gr.pre_process_sm_exception) { |
5611 | ret = g->ops.gr.pre_process_sm_exception(g, gpc, tpc, sm, | 5611 | ret = g->ops.gr.pre_process_sm_exception(g, gpc, tpc, sm, |