[PATCH Review 1/1] drm/amdgpu: adjust ip block suspend sequence on aldebaran to fix disable smu feature failure

[Stanley . Yang]

{
    [  578.019986] amdgpu 0000:23:00.0: amdgpu: GPU reset begin!
    [  583.245566] amdgpu 0000:23:00.0: amdgpu: Failed to disable smu features.
    [  583.245621] amdgpu 0000:23:00.0: amdgpu: Fail to disable dpm features!
    [  583.245639] [drm:amdgpu_device_ip_suspend_phase2 [amdgpu]] *ERROR* 
suspend of IP block <smu> failed -62
    [  583.248504] [drm] free PSP TMR buffer
}

Signed-off-by: Stanley.Yang <stanley.y...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 4e3669407518..364808f3607f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1309,10 +1309,13 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device 
*adev)
                }
        }
 
-       if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
-               r = amdgpu_discovery_set_smu_ip_blocks(adev);
-               if (r)
-                       return r;
+       /* move add smu block after add smda block for aldebaran */
+       if (adev->ip_versions[MP1_HWIP][0] != IP_VERSION(13, 0 ,2)) {
+               if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
+                       r = amdgpu_discovery_set_smu_ip_blocks(adev);
+                       if (r)
+                               return r;
+               }
        }
 
        r = amdgpu_discovery_set_display_ip_blocks(adev);
@@ -1327,6 +1330,14 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device 
*adev)
        if (r)
                return r;
 
+       if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0 ,2)) {
+               if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {
+                       r = amdgpu_discovery_set_smu_ip_blocks(adev);
+                       if (r)
+                               return r;
+               }
+       }
+
        if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&
            !amdgpu_sriov_vf(adev)) {
                r = amdgpu_discovery_set_smu_ip_blocks(adev);
-- 
2.17.1