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

commit d61e1d1d5225a9baeb995bcbdb904f66f70ed87e upstream.

In the S2idle suspend/resume phase the gfxoff is keeping functional so
some IP blocks will be likely to reinitialize at gfxoff entry and that
will result in failing to program GC registers.Therefore, let disallow
gfxoff until AMDGPU IPs reinitialized completely.

Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.15.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index ac4dabc..36cc89f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3185,6 +3185,15 @@ 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;
@@ -4114,6 +4123,13 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon)
        /* 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)
                amdgpu_fbdev_set_suspend(adev, 0);