From c3b595178e9cffb617f104fa7880d704fceebd69 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 16 Oct 2015 12:40:19 -0700 Subject: 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 Reviewed-on: http://git-master/r/819034 --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'drivers') 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( verbose = gk20a_fifo_set_ctx_mmu_error_tsg(g, tsg); - gk20a_fifo_abort_tsg(g, ch->tsgid); + gk20a_fifo_abort_tsg(g, tsg->tsgid); /* put back the ref taken early above */ - if (referenced_channel) { + if (referenced_channel) gk20a_channel_put(ch); - } else { - gk20a_err(dev_from_gk20a(g), - "mmu error in freed tsg channel %d on tsgid %d", - ch->hw_chid, ch->tsgid); - } } else if (ch) { if (referenced_channel) { if (!g->fifo.deferred_reset_pending) -- cgit v1.2.2