Revert "drm/amdgpu: disallow gfxoff until GC IP blocks complete s2idle resume"

This reverts commit f543d28687480fad06b708bc6e0b0b6ec953b078.

This is no longer needed since we no longer touch SDMA 5.x for s0i3.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5c0719c..582a80a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3234,15 +3234,6 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)
                        return r;
                }
                adev->ip_blocks[i].status.hw = true;
-
-               if (adev->in_s0ix && adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {
-                       /* disable gfxoff for IP resume. The gfxoff will be re-enabled in
-                        * amdgpu_device_resume() after IP resume.
-                        */
-                       amdgpu_gfx_off_ctrl(adev, false);
-                       DRM_DEBUG("will disable gfxoff for re-initializing other blocks\n");
-               }
-
        }
 
        return 0;
@@ -4230,13 +4221,6 @@ exit:
        /* Make sure IB tests flushed */
        flush_delayed_work(&adev->delayed_init_work);
 
-       if (adev->in_s0ix) {
-               /* re-enable gfxoff after IP resume. This re-enables gfxoff after
-                * it was disabled for IP resume in amdgpu_device_ip_resume_phase2().
-                */
-               amdgpu_gfx_off_ctrl(adev, true);
-               DRM_DEBUG("will enable gfxoff for the mission mode\n");
-       }
        if (fbcon)
                drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, false);