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/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/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 6f735af9..463317e3 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -363,7 +363,8 @@ struct gpu_ops { | |||
363 | int (*channel_set_timeslice)(struct channel_gk20a *ch, | 363 | int (*channel_set_timeslice)(struct channel_gk20a *ch, |
364 | u32 timeslice); | 364 | u32 timeslice); |
365 | int (*tsg_set_timeslice)(struct tsg_gk20a *tsg, u32 timeslice); | 365 | int (*tsg_set_timeslice)(struct tsg_gk20a *tsg, u32 timeslice); |
366 | int (*force_reset_ch)(struct channel_gk20a *ch, bool verbose); | 366 | int (*force_reset_ch)(struct channel_gk20a *ch, |
367 | u32 err_code, bool verbose); | ||
367 | int (*engine_enum_from_type)(struct gk20a *g, u32 engine_type, | 368 | int (*engine_enum_from_type)(struct gk20a *g, u32 engine_type, |
368 | u32 *inst_id); | 369 | u32 *inst_id); |
369 | void (*device_info_data_parse)(struct gk20a *g, | 370 | void (*device_info_data_parse)(struct gk20a *g, |