drm/amdgpu: clean up the suspend_complete

To check the status of S3 suspend completion,
use the PM core pm_suspend_global_flags bit(1)
to detect S3 abort events. Therefore, clean up
the AMDGPU driver's private flag suspend_complete.

Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 3af5acff8518fe4deeea662a163b91c37d1d2f10..607998d8b1d52e79da5b49820df1d109d5e7c363 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1111,8 +1111,6 @@ struct amdgpu_device {
        bool                            in_s3;
        bool                            in_s4;
        bool                            in_s0ix;
-       /* indicate amdgpu suspension status */
-       bool                            suspend_complete;
 
        enum pp_mp1_state               mp1_state;
        struct amdgpu_doorbell_index doorbell_index;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 46f75651394882c94a6b6d84b112aafe8e45d6b2..ff3ac30744dca99e0485f284613732e8fddcb95c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2500,7 +2500,6 @@ static int amdgpu_pmops_suspend(struct device *dev)
        struct drm_device *drm_dev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = drm_to_adev(drm_dev);
 
-       adev->suspend_complete = false;
        if (amdgpu_acpi_is_s0ix_active(adev))
                adev->in_s0ix = true;
        else if (amdgpu_acpi_is_s3_active(adev))
@@ -2515,7 +2514,6 @@ static int amdgpu_pmops_suspend_noirq(struct device *dev)
        struct drm_device *drm_dev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = drm_to_adev(drm_dev);
 
-       adev->suspend_complete = true;
        if (amdgpu_acpi_should_gpu_reset(adev))
                return amdgpu_asic_reset(adev);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 66947850d7e4e52797319d4f993d35241c7840e0..e9248a855ba7700c428b705a47f1c30ac46b8a6f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -3288,8 +3288,8 @@ static int gfx_v9_0_cp_gfx_start(struct amdgpu_device *adev)
         * confirmed that the APU gfx10/gfx11 needn't such update.
         */
        if (adev->flags & AMD_IS_APU &&
-                       adev->in_s3 && !adev->suspend_complete) {
-               DRM_INFO(" Will skip the CSB packet resubmit\n");
+                       adev->in_s3 && !pm_resume_via_firmware()) {
+               DRM_INFO("Will skip the CSB packet resubmit\n");
                return 0;
        }
        r = amdgpu_ring_alloc(ring, gfx_v9_0_get_csb_size(adev) + 4 + 3);

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index af739b13b6b597cc5488eec6ed1b5cf7719df1a5..533b4b2b432d0781b6aa70fc95ee25886a843805 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -584,13 +584,10 @@ static bool soc15_need_reset_on_resume(struct amdgpu_device *adev)
         *    performing pm core test.
         */
        if (adev->flags & AMD_IS_APU && adev->in_s3 &&
-                       !pm_resume_via_firmware()) {
-               adev->suspend_complete = false;
+                       !pm_resume_via_firmware())
                return true;
-       } else {
-               adev->suspend_complete = true;
+       else
                return false;
-       }
 }
 
 static int soc15_asic_reset(struct amdgpu_device *adev)

diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index 1c07ebdc0d1fa33d73b84a30a35231d8720f81af..93fbb3354720dd838dd4a7e97882a2864dcd2189 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -897,9 +897,10 @@ static bool soc21_need_reset_on_resume(struct amdgpu_device *adev)
        /* Will reset for the following suspend abort cases.
         * 1) Only reset dGPU side.
         * 2) S3 suspend got aborted and TOS is active.
+        *    As for dGPU suspend abort cases the SOL value
+        *    will be kept as zero at this resume point.
         */
-       if (!(adev->flags & AMD_IS_APU) && adev->in_s3 &&
-           !adev->suspend_complete) {
+       if (!(adev->flags & AMD_IS_APU) && adev->in_s3) {
                sol_reg1 = RREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_81);
                msleep(100);
                sol_reg2 = RREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_81);