diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-11-08 14:03:50 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-12-19 18:40:14 -0500 |
commit | c1be5105dadc864159c40bdf1548336ac6fab3f9 (patch) | |
tree | da6bfe71a2634712baa34a01d3b37fbce48766d4 /drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |
parent | 508ec183db0ca94d6d909475d44d02d580c49d9f (diff) |
gpu: nvgpu: Allow channel free to be forced
Allow forced channel freeing. This is useful when the driver is
being cleaned up and the gk20a_wait_until_counter_is_N() could
potentially hang.
Bug 1816516
Bug 1807277
Change-Id: I711f5f3f6413d0bb30b4857e785ca3b504b494ee
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1250022
(cherry picked from commit e132d0e5ae77d758680ac708622a4883bbd69ba3)
Reviewed-on: http://git-master/r/1261918
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index 0ad1bbaa..ba9f332d 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -226,6 +226,7 @@ int gk20a_init_channel_support(struct gk20a *, u32 chid); | |||
226 | 226 | ||
227 | /* must be inside gk20a_busy()..gk20a_idle() */ | 227 | /* must be inside gk20a_busy()..gk20a_idle() */ |
228 | void gk20a_channel_close(struct channel_gk20a *ch); | 228 | void gk20a_channel_close(struct channel_gk20a *ch); |
229 | void __gk20a_channel_kill(struct channel_gk20a *ch); | ||
229 | 230 | ||
230 | bool gk20a_channel_update_and_check_timeout(struct channel_gk20a *ch, | 231 | bool gk20a_channel_update_and_check_timeout(struct channel_gk20a *ch, |
231 | u32 timeout_delta_ms, bool *progress); | 232 | u32 timeout_delta_ms, bool *progress); |