1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index b0e2ce1f..cf97b33a 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1082,15 +1082,16 @@ static bool gk20a_fifo_handle_mmu_fault(
                         mutex_lock(&g->fifo.gr_reset_mutex);
                         /* if lock is already taken, a reset is taking place
                         so no need to repeat */
-                        if (!was_reset) {
-                                if (ch)
-                                        gk20a_ctxsw_trace_channel_reset(g, ch);
-                                else
-                                        gk20a_ctxsw_trace_tsg_reset(g, tsg);
+                        if (!was_reset)
                                 gk20a_fifo_reset_engine(g, engine_id);
-                        }
                         mutex_unlock(&g->fifo.gr_reset_mutex);
                 }
+
+                if (ch)
+                        gk20a_ctxsw_trace_channel_reset(g, ch);
+                else if (tsg)
+                        gk20a_ctxsw_trace_tsg_reset(g, tsg);
+
                 /* disable the channel/TSG from hw and increment
                  * syncpoints */