summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2015-10-12 08:39:43 -0400
committerIshan Mittal <imittal@nvidia.com>2015-10-20 02:52:50 -0400
commit0269339256dee0a8fcd2d6aa1180780039f22fab (patch)
tree190fe62ff3ef4716a6d69259c0c5ca2394301022 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
parentda8ff40e55c498f2ca24d446d45cda9d4d83bbcf (diff)
gpu: nvgpu: restart timer instead of cancel
In gk20a_fifo_handle_sched_error(), we currently cancel the timeout on all the channels But this could cause us to miss one of stuck channel hence, instead of cancelling, restart the timeout of channel on which it is already active Bug 200133289 Change-Id: I40e7e0e5394911fc110ab6fde39592b885dfaf7d Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/816133 Reviewed-by: Ishan Mittal <imittal@nvidia.com> Tested-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index ad7162fc..a035cd87 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1450,7 +1450,7 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
1450 struct channel_gk20a *ch = &f->channel[id]; 1450 struct channel_gk20a *ch = &f->channel[id];
1451 1451
1452 if (is_tsg) { 1452 if (is_tsg) {
1453 gk20a_channel_timeout_stop_all_channels(g); 1453 gk20a_channel_timeout_restart_all_channels(g);
1454 gk20a_fifo_recover(g, BIT(engine_id), id, true, 1454 gk20a_fifo_recover(g, BIT(engine_id), id, true,
1455 true, true); 1455 true, true);
1456 ret = true; 1456 ret = true;
@@ -1472,7 +1472,7 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
1472 * Cancel all channels' timeout since SCHED error might 1472 * Cancel all channels' timeout since SCHED error might
1473 * trigger multiple watchdogs at a time 1473 * trigger multiple watchdogs at a time
1474 */ 1474 */
1475 gk20a_channel_timeout_stop_all_channels(g); 1475 gk20a_channel_timeout_restart_all_channels(g);
1476 gk20a_fifo_recover(g, BIT(engine_id), id, false, 1476 gk20a_fifo_recover(g, BIT(engine_id), id, false,
1477 true, ch->timeout_debug_dump); 1477 true, ch->timeout_debug_dump);
1478 ret = true; 1478 ret = true;