diff options
author | Arto Merilainen <amerilainen@nvidia.com> | 2014-07-03 05:07:30 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:24 -0400 |
commit | d608aa53ee338922cbd47ec144cd6efb36fd0295 (patch) | |
tree | b713238e0541dec4f85d45ee68276b5e643b8421 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | f554ab30463438e5ce76ecf897a527ba5881fdbf (diff) |
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 <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/434038
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 |
1 files changed, 2 insertions, 4 deletions
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) | |||
1191 | struct channel_gk20a *ch = | 1191 | struct channel_gk20a *ch = |
1192 | g->fifo.channel + hw_chid; | 1192 | g->fifo.channel + hw_chid; |
1193 | 1193 | ||
1194 | if (verbose) | ||
1195 | gk20a_debug_dump(g->dev); | ||
1196 | |||
1197 | gk20a_channel_abort(ch); | 1194 | gk20a_channel_abort(ch); |
1198 | for (i = 0; i < g->fifo.max_runlists; i++) | 1195 | for (i = 0; i < g->fifo.max_runlists; i++) |
1199 | gk20a_fifo_update_runlist(g, i, | 1196 | gk20a_fifo_update_runlist(g, i, |
1200 | hw_chid, false, false); | 1197 | hw_chid, false, false); |
1201 | 1198 | ||
1202 | gk20a_fifo_set_ctx_mmu_error(g, ch); | 1199 | if (gk20a_fifo_set_ctx_mmu_error(g, ch)) |
1200 | gk20a_debug_dump(g->dev); | ||
1203 | } | 1201 | } |
1204 | } | 1202 | } |
1205 | 1203 | ||