aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/1300-drm-amdkfd-Fix-destroy_queue_nocpsch-failure-path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1300-drm-amdkfd-Fix-destroy_queue_nocpsch-failure-path.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/1300-drm-amdkfd-Fix-destroy_queue_nocpsch-failure-path.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1300-drm-amdkfd-Fix-destroy_queue_nocpsch-failure-path.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1300-drm-amdkfd-Fix-destroy_queue_nocpsch-failure-path.patch
new file mode 100644
index 00000000..de64dca8
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1300-drm-amdkfd-Fix-destroy_queue_nocpsch-failure-path.patch
@@ -0,0 +1,32 @@
+From 10d8d31952ece1418e5ed2b4e03cb9ad76d23439 Mon Sep 17 00:00:00 2001
+From: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
+Date: Thu, 22 Jun 2017 11:45:14 -0400
+Subject: [PATCH 1300/4131] drm/amdkfd: Fix destroy_queue_nocpsch failure path
+
+Continue deleting the queue if even HQD reset times out. This ensures
+queue data structures are consistent.
+
+BUG: SWDEV-110763
+
+Change-Id: I5d103bdf7c2619dfb56191ab3fe2fa2f54154f85
+Signed-off-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
+---
+ drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+index 052a059..af88ed7 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+@@ -420,8 +420,6 @@ static int destroy_queue_nocpsch_locked(struct device_queue_manager *dqm,
+ KFD_PREEMPT_TYPE_WAVEFRONT_RESET,
+ KFD_HIQ_TIMEOUT,
+ q->pipe, q->queue);
+- if (retval != 0)
+- return retval;
+
+ mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);
+
+--
+2.7.4
+