diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2014-08-04 05:29:41 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:46 -0400 |
commit | 478e659ae466d870889bda8ccba008c6bd27399e (patch) | |
tree | 07befb0bd5e90666ce4f5584354e1ca43291f59c /drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |
parent | 76993ba18c6969cd26bb500eee4ecf734deb7bcb (diff) |
gpu: nvgpu: do not touch runlist during recovery
Currently we clear the runlist and re-create it in
scheduled work during fifo recovery process
But we can post-pone this runlist re-generation for
later time i.e. when channel is closed
Hence, remove runlist locks and re-generation from
handle_mmu_fault() methods. Instead of that, disable
gr fifo access at start of recovery and re-enable
it at end of recovery process.
Also, delete scheduled work to re-create runlist.
Re-enable EPLG and fifo access in
finish_mmu_fault_handling() itself.
bug 1470692
Change-Id: I705a6a5236734c7207a01d9a9fa9eca22bdbe7eb
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/449225
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index e738b152..bed8a361 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -138,8 +138,6 @@ struct fifo_gk20a { | |||
138 | u32 mmu_fault_engines; | 138 | u32 mmu_fault_engines; |
139 | bool deferred_reset_pending; | 139 | bool deferred_reset_pending; |
140 | struct mutex deferred_reset_mutex; | 140 | struct mutex deferred_reset_mutex; |
141 | |||
142 | struct work_struct fault_restore_thread; | ||
143 | }; | 141 | }; |
144 | 142 | ||
145 | int gk20a_init_fifo_support(struct gk20a *g); | 143 | int gk20a_init_fifo_support(struct gk20a *g); |