From 7c69a5cd0311123d3378aee8c8eccf728b984412 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Tue, 21 Jun 2016 21:30:51 +0530 Subject: 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 Reviewed-on: http://git-master/r/1168613 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') 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) gk20a_disable_channel_tsg(g, ch); /* preempt the channel */ gk20a_fifo_preempt(g, ch); + gk20a_channel_timeout_stop(ch); gk20a_channel_cancel_job_clean_up(ch, true); /* wait for channel update notifiers */ if (ch->update_fn) -- cgit v1.2.2