From d608aa53ee338922cbd47ec144cd6efb36fd0295 Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Thu, 3 Jul 2014 12:07:30 +0300 Subject: Revert "gpu: nvgpu: Dump offending push buffer fragment" Channel and gpfifo allocations are entirely separated from each other, however, the code here assumes that active channel means that the channel also has a gpfifo. This reverts commit a24602f094380539788696d1b1567a4f4d914b17 which added gpfifo dump. Changing debug dumping to be safe requires refactoring the channel release code to use proper locking. Bug 1530226 Change-Id: I2fb02542a17dd56a0a9ce732b327e34b85ade8b9 Signed-off-by: Arto Merilainen Reviewed-on: http://git-master/r/434038 Reviewed-by: Deepak Nibade Reviewed-by: Shridhar Rasal Reviewed-by: Bharat Nihalani --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index daf40d9c..1f7b78f9 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -1191,15 +1191,13 @@ void gk20a_fifo_recover_ch(struct gk20a *g, u32 hw_chid, bool verbose) struct channel_gk20a *ch = g->fifo.channel + hw_chid; - if (verbose) - gk20a_debug_dump(g->dev); - gk20a_channel_abort(ch); for (i = 0; i < g->fifo.max_runlists; i++) gk20a_fifo_update_runlist(g, i, hw_chid, false, false); - gk20a_fifo_set_ctx_mmu_error(g, ch); + if (gk20a_fifo_set_ctx_mmu_error(g, ch)) + gk20a_debug_dump(g->dev); } } -- cgit v1.2.2