summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 32915ee1..6312e74a 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1603,11 +1603,14 @@ static bool gk20a_fifo_handle_mmu_fault(
1603 } 1603 }
1604 } 1604 }
1605 } 1605 }
1606 1606 /*
1607 if (ch) 1607 * For non fake mmu fault, both tsg and ch pointers
1608 gk20a_ctxsw_trace_channel_reset(g, ch); 1608 * could be valid. Check tsg first.
1609 else if (tsg) 1609 */
1610 if (tsg)
1610 gk20a_ctxsw_trace_tsg_reset(g, tsg); 1611 gk20a_ctxsw_trace_tsg_reset(g, tsg);
1612 else if (ch)
1613 gk20a_ctxsw_trace_channel_reset(g, ch);
1611 1614
1612 /* disable the channel/TSG from hw and increment 1615 /* disable the channel/TSG from hw and increment
1613 * syncpoints */ 1616 * syncpoints */