diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-10-21 16:14:09 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-10-22 14:41:24 -0400 |
commit | 75c09b96b409dfbd495081100e5fa82605651947 (patch) | |
tree | 3aab3b2e170926b0a3fe0e9e70b9bd8ed7caef3a /drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |
parent | 790173dcfd505d03bd5fb1a92e28bb53c94b0876 (diff) |
gpu: nvgpu: Protect sync by an own lock
Protect creation and deletion of sync by an own mutex. This prevents
deadlock in channel abort when abort is called from submit path.
Bug 200147887
Change-Id: I5d6308b773c1d1a6a89d4590e2e74c74d691f79d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/821127
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index 3e18e053..794d8228 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -166,6 +166,7 @@ struct channel_gk20a { | |||
166 | struct nvgpu_notification *error_notifier; | 166 | struct nvgpu_notification *error_notifier; |
167 | void *error_notifier_va; | 167 | void *error_notifier_va; |
168 | 168 | ||
169 | struct mutex sync_lock; | ||
169 | struct gk20a_channel_sync *sync; | 170 | struct gk20a_channel_sync *sync; |
170 | 171 | ||
171 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | 172 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION |