diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2016-06-21 12:00:51 -0400 |
|---|---|---|
| committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-22 13:49:14 -0400 |
| commit | 7c69a5cd0311123d3378aee8c8eccf728b984412 (patch) | |
| tree | 31924a956f30de5efbd61b915c1d1d17a78e3aaa /drivers | |
| parent | f438c66598cf169ec7669bc659c7b23587b5bab3 (diff) | |
gpu: nvgpu: cancel channel wdt during suspend
Cancel channel watchdog timeout during channel suspend
This should help fix race conditions when watchdog is triggered
during shutdown
Bug 200209309
Change-Id: I6cf740d854c27985217a1a76afa822e3126d4153
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1168613
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index db0f746f..5b007f33 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
| @@ -2832,6 +2832,7 @@ int gk20a_channel_suspend(struct gk20a *g) | |||
| 2832 | gk20a_disable_channel_tsg(g, ch); | 2832 | gk20a_disable_channel_tsg(g, ch); |
| 2833 | /* preempt the channel */ | 2833 | /* preempt the channel */ |
| 2834 | gk20a_fifo_preempt(g, ch); | 2834 | gk20a_fifo_preempt(g, ch); |
| 2835 | gk20a_channel_timeout_stop(ch); | ||
| 2835 | gk20a_channel_cancel_job_clean_up(ch, true); | 2836 | gk20a_channel_cancel_job_clean_up(ch, true); |
| 2836 | /* wait for channel update notifiers */ | 2837 | /* wait for channel update notifiers */ |
| 2837 | if (ch->update_fn) | 2838 | if (ch->update_fn) |