diff options
author | Vijayakumar <vsubbu@nvidia.com> | 2015-08-04 07:44:54 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-09-16 12:44:00 -0400 |
commit | b8faddfe2ad3d52837b0f766d74feb8e6d6f4ce5 (patch) | |
tree | 9cf25fcdd5e9ac2ff870f78c35213ce46b90ac7a /drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |
parent | 2359f247d18fbde3220e463543193ab06f75fe81 (diff) |
gpu: nvgpu: fix runlist update timeout handling
bug 1625901
1) disable ELPG before doing GR reset when runlist update times out
2) add mutex for GR reset to avoid multiple threads resetting GR
3) protect GR reset with FECS mutex so that no one else submits methods
Change-Id: I02993fd1eabe6875ab1c58a40a06e6c79fcdeeae
Signed-off-by: Vijayakumar <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/793643
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index 7385f9be..3eb193f6 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -109,6 +109,7 @@ struct fifo_gk20a { | |||
109 | /* zero-kref'd channels here */ | 109 | /* zero-kref'd channels here */ |
110 | struct list_head free_chs; | 110 | struct list_head free_chs; |
111 | struct mutex free_chs_mutex; | 111 | struct mutex free_chs_mutex; |
112 | struct mutex gr_reset_mutex; | ||
112 | 113 | ||
113 | struct tsg_gk20a *tsg; | 114 | struct tsg_gk20a *tsg; |
114 | struct mutex tsg_inuse_mutex; | 115 | struct mutex tsg_inuse_mutex; |