summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorOded Gabbay <oded.gabbay@gmail.com>2015-07-29 10:33:06 +0300
committerOded Gabbay <oded.gabbay@gmail.com>2015-07-30 09:26:00 +0300
commite8a64b20eb27cd9c9403f51e4e6c415f9e096e39 (patch)
tree409cfe95a297c5fa7f9169c133b13be10671c665 /drivers/gpu
parentdcd14dd957f02ef679c61325a2221a0574bdcab3 (diff)
downloadtalos-obmc-linux-e8a64b20eb27cd9c9403f51e4e6c415f9e096e39.tar.gz
talos-obmc-linux-e8a64b20eb27cd9c9403f51e4e6c415f9e096e39.zip
drm/amdgpu: fix bug when amdkfd destroys hqd
The wrong define was used to check if the hqd is still active v2: Don't use SHIFT as the MASK is already shifted Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c2
1 files changed, 1 insertions, 1 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 2daad335b809..dd2037bc0b4a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
@@ -450,7 +450,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__SHIFT)
+ if (temp & CP_HQD_ACTIVE__ACTIVE_MASK)
break;
if (timeout == 0) {
pr_err("kfd: cp queue preemption time out (%dms)\n",
OpenPOWER on IntegriCloud