drm/amdgpu: Change SI/CI gfx/sdma/smu init sequence

initialize gfx/sdma before dpm features enabled.

Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index c364ef94cc36..f8408f88cd37 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -2057,13 +2057,13 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
                 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
                 else
                         amdgpu_device_ip_block_add(adev, &dce_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
                 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
                 break;
@@ -2071,13 +2071,14 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
                 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
                 else
                         amdgpu_device_ip_block_add(adev, &dce_v6_4_ip_block);
-                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
+
                 /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
                 /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
                 break;
@@ -2085,11 +2086,11 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
                 amdgpu_device_ip_block_add(adev, &si_common_ip_block);
                 amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 amdgpu_device_ip_block_add(adev, &si_smu_ip_block);
                 if (adev->enable_virtual_display)
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
-                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 break;
         default:
                 BUG();