1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index f736fe8c..4f3363f2 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -344,6 +344,7 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
         u32 mask;
         u32 timeout;
         int i;
+        struct gk20a_platform *platform = platform_get_drvdata(g->dev);
 
         gk20a_dbg_fn("");
         /* enable pmc pfifo */
@@ -408,8 +409,9 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
         if (g->ops.fifo.apply_pb_timeout)
                 g->ops.fifo.apply_pb_timeout(g);
 
-        timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US |
-                        fifo_eng_timeout_detection_enabled_f();
+        timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US;
+        timeout = scale_ptimer(timeout, platform->ptimerscaling10x);
+        timeout |= fifo_eng_timeout_detection_enabled_f();
         gk20a_writel(g, fifo_eng_timeout_r(), timeout);
 
         gk20a_dbg_fn("done");
@@ -1448,6 +1450,7 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
                 struct channel_gk20a *ch = &f->channel[id];
 
                 if (is_tsg) {
+                        gk20a_channel_timeout_stop_all_channels(g);
                         gk20a_fifo_recover(g, BIT(engine_id), id, true,
                                         true, true);
                         ret = true;
@@ -1465,6 +1468,11 @@ static bool gk20a_fifo_handle_sched_error(struct gk20a *g)
                                 "fifo sched ctxsw timeout error:"
                                 "engine = %u, ch = %d", engine_id, id);
                         gk20a_gr_debug_dump(g->dev);
+                        /*
+                         * Cancel all channels' timeout since SCHED error might
+                         * trigger multiple watchdogs at a time
+                         */
+                        gk20a_channel_timeout_stop_all_channels(g);
                         gk20a_fifo_recover(g, BIT(engine_id), id, false,
                                 true, ch->timeout_debug_dump);
                         ret = true;