diff options
author | Richard Zhao <rizhao@nvidia.com> | 2016-08-12 20:10:28 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-08-18 18:03:54 -0400 |
commit | 198b895a881ca067a2411b7367579cb1d594ab5a (patch) | |
tree | 90e667382a589de9ba4d97bf511ca6bd42efe03c /drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |
parent | deffbf8ee2017d4ea804f35946673dd0f6e0fcf2 (diff) |
gpu: nvgpu: use force_reset_ch in ch wdt handler
- let force_reset_ch pass down err code
- force_reset_ch callback can cover vgpu too.
Bug 1776876
JIRA VFND-2151
Change-Id: I48f7890294c6455247198e0cab5f21f83f61f0e1
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/1202255
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index f5a73a12..17c6dbf6 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -197,7 +197,8 @@ void gk20a_fifo_recover(struct gk20a *g, | |||
197 | bool id_is_known, bool verbose); | 197 | bool id_is_known, bool verbose); |
198 | void gk20a_fifo_recover_ch(struct gk20a *g, u32 hw_chid, bool verbose); | 198 | void gk20a_fifo_recover_ch(struct gk20a *g, u32 hw_chid, bool verbose); |
199 | void gk20a_fifo_recover_tsg(struct gk20a *g, u32 tsgid, bool verbose); | 199 | void gk20a_fifo_recover_tsg(struct gk20a *g, u32 tsgid, bool verbose); |
200 | int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch, bool verbose); | 200 | int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch, |
201 | u32 err_code, bool verbose); | ||
201 | void gk20a_fifo_reset_engine(struct gk20a *g, u32 engine_id); | 202 | void gk20a_fifo_reset_engine(struct gk20a *g, u32 engine_id); |
202 | int gk20a_init_fifo_reset_enable_hw(struct gk20a *g); | 203 | int gk20a_init_fifo_reset_enable_hw(struct gk20a *g); |
203 | void gk20a_init_fifo(struct gpu_ops *gops); | 204 | void gk20a_init_fifo(struct gpu_ops *gops); |