3 files changed, 23 insertions, 78 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index dfc10b1baea0..e04de7a81592 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -4132,18 +4132,12 @@ static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev)
         gfx_v8_0_rlc_reset(adev);
         gfx_v8_0_init_pg(adev);
 
-        if (!adev->pp_enabled) {
-                if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) {
-                        /* legacy rlc firmware loading */
-                        r = gfx_v8_0_rlc_load_microcode(adev);
-                        if (r)
-                                return r;
-                } else {
-                        r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                        AMDGPU_UCODE_ID_RLC_G);
-                        if (r)
-                                return -EINVAL;
-                }
+
+        if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {
+                /* legacy rlc firmware loading */
+                r = gfx_v8_0_rlc_load_microcode(adev);
+                if (r)
+                        return r;
         }
 
         gfx_v8_0_rlc_start(adev);
@@ -4959,43 +4953,15 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev)
         if (!(adev->flags & AMD_IS_APU))
                 gfx_v8_0_enable_gui_idle_interrupt(adev, false);
 
-        if (!adev->pp_enabled) {
-                if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) {
+        if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {
                         /* legacy firmware loading */
-                        r = gfx_v8_0_cp_gfx_load_microcode(adev);
-                        if (r)
-                                return r;
+                r = gfx_v8_0_cp_gfx_load_microcode(adev);
+                if (r)
+                        return r;
 
-                        r = gfx_v8_0_cp_compute_load_microcode(adev);
-                        if (r)
-                                return r;
-                } else {
-                        r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                        AMDGPU_UCODE_ID_CP_CE);
-                        if (r)
-                                return -EINVAL;
-
-                        r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                        AMDGPU_UCODE_ID_CP_PFP);
-                        if (r)
-                                return -EINVAL;
-
-                        r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                        AMDGPU_UCODE_ID_CP_ME);
-                        if (r)
-                                return -EINVAL;
-
-                        if (adev->asic_type == CHIP_TOPAZ) {
-                                r = gfx_v8_0_cp_compute_load_microcode(adev);
-                                if (r)
-                                        return r;
-                        } else {
-                                r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                                                 AMDGPU_UCODE_ID_CP_MEC1);
-                                if (r)
-                                        return -EINVAL;
-                        }
-                }
+                r = gfx_v8_0_cp_compute_load_microcode(adev);
+                if (r)
+                        return r;
         }
 
         r = gfx_v8_0_cp_gfx_resume(adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index acdee3a4602c..67f375bfe452 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -561,21 +561,11 @@ static int sdma_v2_4_start(struct amdgpu_device *adev)
 {
         int r;
 
-        if (!adev->pp_enabled) {
-                if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) {
-                        r = sdma_v2_4_load_microcode(adev);
-                        if (r)
-                                return r;
-                } else {
-                        r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                        AMDGPU_UCODE_ID_SDMA0);
-                        if (r)
-                                return -EINVAL;
-                        r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                        AMDGPU_UCODE_ID_SDMA1);
-                        if (r)
-                                return -EINVAL;
-                }
+
+        if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {
+                r = sdma_v2_4_load_microcode(adev);
+                if (r)
+                        return r;
         }
 
         /* halt the engine before programing */
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 72f31cc7df00..6d06f8eb659f 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -819,23 +819,12 @@ static int sdma_v3_0_load_microcode(struct amdgpu_device *adev)
  */
 static int sdma_v3_0_start(struct amdgpu_device *adev)
 {
-        int r, i;
+        int r;
 
-        if (!adev->pp_enabled) {
-                if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) {
-                        r = sdma_v3_0_load_microcode(adev);
-                        if (r)
-                                return r;
-                } else {
-                        for (i = 0; i < adev->sdma.num_instances; i++) {
-                                r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-                                                                                 (i == 0) ?
-                                                                                 AMDGPU_UCODE_ID_SDMA0 :
-                                                                                 AMDGPU_UCODE_ID_SDMA1);
-                                if (r)
-                                        return -EINVAL;
-                        }
-                }
+        if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {
+                r = sdma_v3_0_load_microcode(adev);
+                if (r)
+                        return r;
         }
 
         /* disable sdma engine before programing it */