diff options
author | Vijayakumar <vsubbu@nvidia.com> | 2015-06-29 05:12:56 -0400 |
---|---|---|
committer | Vijayakumar Subbu <vsubbu@nvidia.com> | 2015-07-17 04:16:48 -0400 |
commit | 55c85cfa7bc297b525a3b099d469eee0b71b155a (patch) | |
tree | 9835cc4b39d45fa1dac2e4b9dc477a6d39569232 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |
parent | 37869170e4f3c42fa31faa1bcda1e6c0a188179c (diff) |
gpu: nvgpu: improve sched err handling
bug 200114561
1) when handling sched error, if CTXSW status reads switch
check FECS mailbox register to know whether next or current
channel caused error
2) Update recovery function to use ch id passed to it
3) Recovery function now passes mmu_engine_id to mmu fault
handler instead of fifo_engine_id
Change-Id: I3576cc4a90408b2f76b2c42cce19c27344531b1c
Signed-off-by: Vijayakumar <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/763538
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index fdf843d2..bc9315d2 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -164,7 +164,7 @@ void gk20a_fifo_recover(struct gk20a *g, | |||
164 | u32 engine_ids, /* if zero, will be queried from HW */ | 164 | u32 engine_ids, /* if zero, will be queried from HW */ |
165 | u32 hw_id, /* if ~0, will be queried from HW */ | 165 | u32 hw_id, /* if ~0, will be queried from HW */ |
166 | bool hw_id_is_tsg, /* ignored if hw_id == ~0 */ | 166 | bool hw_id_is_tsg, /* ignored if hw_id == ~0 */ |
167 | bool verbose); | 167 | bool id_is_known, bool verbose); |
168 | void gk20a_fifo_recover_ch(struct gk20a *g, u32 hw_chid, bool verbose); | 168 | void gk20a_fifo_recover_ch(struct gk20a *g, u32 hw_chid, bool verbose); |
169 | void gk20a_fifo_recover_tsg(struct gk20a *g, u32 tsgid, bool verbose); | 169 | void gk20a_fifo_recover_tsg(struct gk20a *g, u32 tsgid, bool verbose); |
170 | int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch, bool verbose); | 170 | int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch, bool verbose); |