Skip to content

Commit 9cef84b

Browse files
Prike LiangBob Zhou
Prike Liang
authored and
Bob Zhou
committed
drm/amdgpu: update suspend status for aborting from deeper suspend
There're some other suspend abort cases which can call the noirq suspend except for executing _S3 method. In those cases need to process as incomplete suspendsion. Signed-off-by: Prike Liang <[email protected]> Acked-by: Alex Deucher <[email protected]>
1 parent c667a01 commit 9cef84b

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Diff for: drivers/gpu/drm/amd/amdgpu/soc15.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -587,11 +587,13 @@ static bool soc15_need_reset_on_resume(struct amdgpu_device *adev)
587587
* 2) S3 suspend abort and TOS already launched.
588588
*/
589589
if (adev->flags & AMD_IS_APU && adev->in_s3 &&
590-
!adev->suspend_complete &&
591-
sol_reg)
590+
sol_reg) {
591+
adev->suspend_complete = false;
592592
return true;
593-
594-
return false;
593+
} else {
594+
adev->suspend_complete = true;
595+
return false;
596+
}
595597
}
596598

597599
static int soc15_asic_reset(struct amdgpu_device *adev)

0 commit comments

Comments
 (0)