<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<p style="font-family:Arial;font-size:10pt;color:#0000FF;margin:5pt;" align="Left">
[AMD Official Use Only]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
I don't think this will work properly. The in_s3 flag was mainly for runtime pm vs system suspend. I'm not sure if in_s0ix is properly handled everywhere we check in_s3.</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Alex</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Mario Limonciello <mario.limonciello@amd.com><br>
<b>Sent:</b> Monday, January 3, 2022 10:23 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Limonciello, Mario <Mario.Limonciello@amd.com><br>
<b>Subject:</b> [PATCH 2/2] drm/amdgpu: don't set s3 and s0ix at the same time</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">This makes it clearer which codepaths are in use specifically in<br>
one state or the other.<br>
<br>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ++++--<br>
1 file changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c<br>
index db2a9dfd5918..413fecc89e6c 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c<br>
@@ -2165,9 +2165,9 @@ static int amdgpu_pmops_suspend(struct device *dev)<br>
<br>
if (amdgpu_acpi_is_s0ix_active(adev))<br>
adev->in_s0ix = true;<br>
- adev->in_s3 = true;<br>
+ else<br>
+ adev->in_s3 = true;<br>
r = amdgpu_device_suspend(drm_dev, true);<br>
- adev->in_s3 = false;<br>
if (r)<br>
return r;<br>
if (!adev->in_s0ix)<br>
@@ -2188,6 +2188,8 @@ static int amdgpu_pmops_resume(struct device *dev)<br>
r = amdgpu_device_resume(drm_dev, true);<br>
if (amdgpu_acpi_is_s0ix_active(adev))<br>
adev->in_s0ix = false;<br>
+ else<br>
+ adev->in_s3 = false;<br>
return r;<br>
}<br>
<br>
-- <br>
2.25.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>