From: Jonathan Kim <jonathan.kim@amd.com>
Date: Fri, 2 Jun 2023 17:52:04 +0000 (-0400)
Subject: drm/amdgpu: fix debug wait on idle for gfx9.4.1
X-Git-Tag: v6.5-rc1~153^2~7^2~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bd443cb74bd47d820c3cc31ee0ed3008d004d73;p=thirdparty%2Flinux.git

drm/amdgpu: fix debug wait on idle for gfx9.4.1

Wait calls for amd_ip_block_type not amd_hw_ip_block_type.

Reported-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
index 6df215aba4c4e..625db444df1cb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
@@ -309,7 +309,7 @@ out:
 	if (!suspend || r)
 		return r;
 
-	return amdgpu_device_ip_wait_for_idle(adev, GC_HWIP);
+	return amdgpu_device_ip_wait_for_idle(adev, AMD_IP_BLOCK_TYPE_GFX);
 }
 
 static void set_barrier_auto_waitcnt(struct amdgpu_device *adev, bool enable_waitcnt)