1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 194d5e3c..b14b2a27 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -815,11 +815,15 @@ 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;
-        timeout = scale_ptimer(timeout,
-                ptimer_scalingfactor10x(g->ptimer_src_freq));
-        timeout |= fifo_eng_timeout_detection_enabled_f();
-        gk20a_writel(g, fifo_eng_timeout_r(), timeout);
+        if (g->ops.fifo.apply_ctxsw_timeout_intr)
+                g->ops.fifo.apply_ctxsw_timeout_intr(g);
+        else {
+                timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US;
+                timeout = scale_ptimer(timeout,
+                        ptimer_scalingfactor10x(g->ptimer_src_freq));
+                timeout |= fifo_eng_timeout_detection_enabled_f();
+                gk20a_writel(g, fifo_eng_timeout_r(), timeout);
+        }
 
         /* clear and enable pbdma interrupt */
         for (i = 0; i < host_num_pbdma; i++) {