<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:#317100;margin:15pt;" align="Left">
[AMD Public Use]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Series is:</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Alex Deucher <alexander.deucher@amd.com><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> Quan, Evan <Evan.Quan@amd.com><br>
<b>Sent:</b> Wednesday, October 28, 2020 4:30 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Deucher, Alexander <Alexander.Deucher@amd.com>; sandy.8925@gmail.com <sandy.8925@gmail.com>; Quan, Evan <Evan.Quan@amd.com><br>
<b>Subject:</b> [PATCH 5/5] drm/amd/pm: do not use ixFEATURE_STATUS for checking smc running</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">This reverts commit f87812284172a9809820d10143b573d833cd3f75 "drm/amdgpu:<br>
Fix bug where DPM is not enabled after hibernate and resume".<br>
It was intended to fix Hawaii S4(hibernation) issue but break S3. As<br>
ixFEATURE_STATUS is filled with garbage data on resume which can be<br>
only cleared by reloading smc firmware(but that will involve many<br>
changes). So, we will revert this S4 fix and seek a new way.<br>
<br>
Change-Id: If9eed2f5a9c1168fb20be92057b583d854ad779e<br>
Signed-off-by: Evan Quan <evan.quan@amd.com><br>
---<br>
drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 5 +----<br>
1 file changed, 1 insertion(+), 4 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c<br>
index 09128122b493..329bf4d44bbc 100644<br>
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c<br>
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c<br>
@@ -2726,10 +2726,7 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)<br>
<br>
static bool ci_is_dpm_running(struct pp_hwmgr *hwmgr)<br>
{<br>
- return (1 == PHM_READ_INDIRECT_FIELD(hwmgr->device,<br>
- CGS_IND_REG__SMC, FEATURE_STATUS,<br>
- VOLTAGE_CONTROLLER_ON))<br>
- ? true : false;<br>
+ return ci_is_smc_ram_running(hwmgr);<br>
}<br>
<br>
static int ci_smu_init(struct pp_hwmgr *hwmgr)<br>
-- <br>
2.29.0<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>