summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2015-10-16 15:40:19 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2015-10-20 16:58:35 -0400
commitc3b595178e9cffb617f104fa7880d704fceebd69 (patch)
tree2b49a0dd9ef7c2acd07a303086369e82ab0d173e /drivers
parent0269339256dee0a8fcd2d6aa1180780039f22fab (diff)
gpu: nvgpu: Fix fake MMU fault for TSGs
When we induce a fake MMU fault, we do not have pointer to a channel. Use the tsg pointer instead. Also remove the error print in case we do not have ch pointer. Change-Id: I14fd75d2b743244915bf32fe39de76097ef5c42f Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/819034
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index a035cd87..39cb1174 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1053,16 +1053,11 @@ static bool gk20a_fifo_handle_mmu_fault(
1053 verbose = 1053 verbose =
1054 gk20a_fifo_set_ctx_mmu_error_tsg(g, tsg); 1054 gk20a_fifo_set_ctx_mmu_error_tsg(g, tsg);
1055 1055
1056 gk20a_fifo_abort_tsg(g, ch->tsgid); 1056 gk20a_fifo_abort_tsg(g, tsg->tsgid);
1057 1057
1058 /* put back the ref taken early above */ 1058 /* put back the ref taken early above */
1059 if (referenced_channel) { 1059 if (referenced_channel)
1060 gk20a_channel_put(ch); 1060 gk20a_channel_put(ch);
1061 } else {
1062 gk20a_err(dev_from_gk20a(g),
1063 "mmu error in freed tsg channel %d on tsgid %d",
1064 ch->hw_chid, ch->tsgid);
1065 }
1066 } else if (ch) { 1061 } else if (ch) {
1067 if (referenced_channel) { 1062 if (referenced_channel) {
1068 if (!g->fifo.deferred_reset_pending) 1063 if (!g->fifo.deferred_reset_pending)