1 files changed, 43 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0680-drm-amdgpu-wait-interruptible-when-semaphores-are-di.patch b/common/recipes-kernel/linux/files/0680-drm-amdgpu-wait-interruptible-when-semaphores-are-di.patch
new file mode 100644
index 00000000..16af4468
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0680-drm-amdgpu-wait-interruptible-when-semaphores-are-di.patch
@@ -0,0 +1,43 @@
+From b9f723726e332d1d42d68571cc952896645457ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Thu, 10 Sep 2015 15:03:50 +0200
+Subject: [PATCH 0680/1050] drm/amdgpu: wait interruptible when semaphores are
+ disabled v2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise debugging locked up processes isn't possible.
+
+v2: rebased
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+index a6697fd..dd005c3 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+@@ -302,8 +302,14 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync,
+ 			return -EINVAL;
+ 		}
+ 
+-		if (amdgpu_enable_scheduler || !amdgpu_enable_semaphores ||
+-		    (count >= AMDGPU_NUM_SYNCS)) {
++		if (amdgpu_enable_scheduler || !amdgpu_enable_semaphores) {
++			r = fence_wait(&fence->base, true);
++			if (r)
++				return r;
++			continue;
++		}
++
++		if (count >= AMDGPU_NUM_SYNCS) {
+ 			/* not enough room, wait manually */
+ 			r = fence_wait(&fence->base, false);
+ 			if (r)
+-- 
+1.9.1
+