From 75c09b96b409dfbd495081100e5fa82605651947 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 21 Oct 2015 13:14:09 -0700 Subject: 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 Reviewed-on: http://git-master/r/821127 --- drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.h') 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 { struct nvgpu_notification *error_notifier; void *error_notifier_va; + struct mutex sync_lock; struct gk20a_channel_sync *sync; #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION -- cgit v1.2.2