[PATCH] drm/amdgpu: allow more APUs to do mode2 reset when go to S4 (v2)

[Huang, Tim]

[AMD Official Use Only - General]

Please ignore this v2 patch, already have one with the fix. Thanks.
https://gitlab.freedesktop.org/agd5f/linux/-/commit/2fec9dc8e0acc3dfb56d1389151bcf405f087b10


Best Regards,
Tim Huang

-----Original Message-----
From: Huang, Tim <Tim.Huang at amd.com>
Sent: Friday, March 31, 2023 11:41 AM
To: amd-gfx at lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Limonciello, Mario <Mario.Limonciello at amd.com>; Zhang, Yifan <Yifan1.Zhang at amd.com>; Yuan, Perry <Perry.Yuan at amd.com>; Du, Xiaojian <Xiaojian.Du at amd.com>; Ma, Li <Li.Ma at amd.com>; Huang, Tim <Tim.Huang at amd.com>; Yuan, Perry <Perry.Yuan at amd.com>
Subject: [PATCH] drm/amdgpu: allow more APUs to do mode2 reset when go to S4 (v2)

Skip mode2 reset only for IMU enabled APUs when do S4 to fix the possible S4 regression issues on old ASICs.

v2:
Update this commit message to add Fixes and Link tags.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2483
Fixes: 2bedd3f21b30 ("drm/amdgpu: skip ASIC reset for APUs when go to S4")
Signed-off-by: Tim Huang <tim.huang at amd.com>
Tested-by: Yuan Perry <Perry.Yuan at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index 0f7cd3e8e00b..edaf3ded4a04 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -981,7 +981,12 @@ static bool amdgpu_atcs_pci_probe_handle(struct pci_dev *pdev)
  */
 bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev)  {
-       if (adev->flags & AMD_IS_APU)
+       if ((adev->flags & AMD_IS_APU) &&
+           adev->gfx.imu.funcs) /* Not need to do mode2 reset for IMU enabled APUs */
+               return false;
+
+       if ((adev->flags & AMD_IS_APU) &&
+           amdgpu_acpi_is_s3_active(adev))
                return false;

        if (amdgpu_sriov_vf(adev))
--
2.25.1