On 11/24/2021 23:48, Prike Liang wrote:
Do ASIC reset at the moment Sx suspend aborted behind of amdgpu suspend
to keep AMDGPU in a clean reset state and that can avoid re-initialize
device improperly error. Currently,we just always do asic reset in the
amdgpu resume until sort out the PM abort case.
v2: Remove incomplete PM abort flag and add GPU hive case check for
GPU reset.
v3: Some dGPU reset method not support at the early resume time and
temprorary skip the dGPU case.
FYI to you that this was tested on an issue with S3 exit to show success
that you will want to include in a Fixes tag for v4 when you change it
to just run for S3 path, not S0i3 path.
https://gitlab.freedesktop.org/drm/amd/-/issues/1822
Signed-off-by: Prike Liang <Prike.Liang@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 7d4115d..f6e1a6a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3983,6 +3983,14 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon)
if (adev->in_s0ix)
amdgpu_gfx_state_change_set(adev, sGpuChangeState_D0Entry);
+ /*TODO: In order to not let all-always asic reset affect resume latency
+ * need sort out the case which really need asic reset in the resume process.
+ * As to the known issue on the system suspend abort behind the AMDGPU suspend,
+ * may can sort this case by checking struct suspend_stats which need exported
+ * firstly.
+ */
+ if (adev->flags & AMD_IS_APU)
+ amdgpu_asic_reset(adev);
/* post card */
if (amdgpu_device_need_post(adev)) {
r = amdgpu_device_asic_init(adev);
