aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1427-drm-amdkfd-Rectify-the-way-to-check-activeness-of-HQ.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1427-drm-amdkfd-Rectify-the-way-to-check-activeness-of-HQ.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1427-drm-amdkfd-Rectify-the-way-to-check-activeness-of-HQ.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1427-drm-amdkfd-Rectify-the-way-to-check-activeness-of-HQ.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1427-drm-amdkfd-Rectify-the-way-to-check-activeness-of-HQ.patch
new file mode 100644
index 00000000..ab1b0db5
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1427-drm-amdkfd-Rectify-the-way-to-check-activeness-of-HQ.patch
@@ -0,0 +1,45 @@
+From 463eb56ceb48f609f3c9433090408c34c79e820a Mon Sep 17 00:00:00 2001
+From: Yong Zhao <yong.zhao@amd.com>
+Date: Tue, 10 May 2016 15:24:07 -0400
+Subject: [PATCH 1427/4131] drm/amdkfd: Rectify the way to check activeness of
+ HQD
+
+The logic was previously inverted by mistake.
+
+Change-Id: I233ecbf9df9d494d8b95ce24c44ce619c37c5b00
+Signed-off-by: Yong Zhao <yong.zhao@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 3 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+index 1051556..833812a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+@@ -466,8 +466,7 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,
+
+ while (true) {
+ temp = RREG32(mmCP_HQD_ACTIVE);
+- /* FIXME: this looks backwards */
+- if (temp & CP_HQD_ACTIVE__ACTIVE_MASK)
++ if (!(temp & CP_HQD_ACTIVE__ACTIVE_MASK))
+ break;
+ if (timeout <= 0) {
+ pr_err("kfd: cp queue preemption time out (%dms)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+index 0c6e3a4..324b4eb 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+@@ -481,7 +481,7 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,
+
+ while (true) {
+ temp = RREG32(mmCP_HQD_ACTIVE);
+- if (temp & CP_HQD_ACTIVE__ACTIVE_MASK)
++ if (!(temp & CP_HQD_ACTIVE__ACTIVE_MASK))
+ break;
+ if (timeout <= 0) {
+ pr_err("kfd: cp queue preemption time out.\n");
+--
+2.7.4
+