<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:DengXian;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"\@宋体";
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"\@等线";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
font-size:12.0pt;
font-family:宋体;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
span.EmailStyle19
{mso-style-type:personal-reply;
font-family:DengXian;
color:windowtext;}
span.searchhighlight
{mso-style-name:searchhighlight;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
{page:WordSection1;}
--></style>
</head>
<body lang="ZH-CN" link="#0563C1" vlink="#954F72" style="word-wrap:break-word">
<p style="font-family:Arial;font-size:10pt;color:#0000FF;margin:5pt;" align="Left">
[AMD Official Use Only - General]<br>
</p>
<br>
<div>
<p style="font-family:Calibri;font-size:10pt;color:#0000FF;margin:5pt;" align="Left">
[AMD Official Use Only - General]<br>
</p>
<div class="WordSection1">
<p class="MsoNormal"><span class="searchhighlight"><span lang="EN-US" style="font-size:11.0pt;font-family:"Times New Roman",serif;color:#070706;background:#FFEE94">Reviewed-by</span></span><span lang="EN-US" style="font-size:11.0pt;font-family:"Times New Roman",serif;color:black">:
Kenneth Feng <</span><span lang="EN-US" style="color:black"><a href="mailto:kenneth.feng@amd.com" title="mailto:kenneth.feng@amd.com"><span style="font-size:11.0pt;font-family:"Times New Roman",serif;color:#0078D4">kenneth.feng@amd.com</span></a></span><span lang="EN-US" style="font-size:11.0pt;font-family:"Times New Roman",serif;color:black">></span><span lang="EN-US"><o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<div>
<div>
<div>
<p class="MsoNormal"><span lang="EN-US">Best wishes<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">Kenneth Feng <o:p></o:p></span></p>
</div>
</div>
</div>
<p class="MsoNormal"><span lang="EN-US" style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US" style="font-size:10.5pt;font-family:DengXian"><o:p> </o:p></span></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal" style="margin-bottom:12.0pt"><b><span style="color:black">发件人</span></b><b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">:</span></b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black"> amd-gfx
<amd-gfx-bounces@lists.freedesktop.org> </span><span style="color:black">代表</span><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black"> Yang Wang <KevinYang.Wang@amd.com><br>
</span><b><span style="color:black">日期</span></b><b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">:</span></b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">
</span><span style="color:black">星期五</span><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">, 2022</span><span style="color:black">年</span><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">6</span><span style="color:black">月</span><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">10</span><span style="color:black">日</span><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">
11:52<br>
</span><b><span style="color:black">收件人</span></b><b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">:</span></b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black"> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
</span><b><span style="color:black">抄送</span></b><b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">:</span></b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black"> Feng, Kenneth <Kenneth.Feng@amd.com>, Wang, Yang(Kevin)
<KevinYang.Wang@amd.com><br>
</span><b><span style="color:black">主题</span></b><b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black">:</span></b><span lang="EN-US" style="font-family:"Calibri",sans-serif;color:black"> [PATCH] drm/amd/pm: skip to set mp1 unload state
in special case<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span lang="EN-US" style="font-size:11.0pt">[CAUTION: External Email]<br>
<br>
set mp1 unload state will cause the SMC FW can't accept any SMU message,<br>
skip to set mp1 unload state to avoid following case fail:<br>
- runtime pm case.<br>
- gpu reset case.<br>
<br>
Fixes: 826126d8f805 ("drm/amd/pm: fix driver reload SMC firmware fail issue for smu13")<br>
<br>
Signed-off-by: Yang Wang <KevinYang.Wang@amd.com><br>
---<br>
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 ++++++-----<br>
1 file changed, 6 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c<br>
index 3d269d1c2749..fd79b213fab4 100644<br>
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c<br>
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c<br>
@@ -1415,12 +1415,13 @@ static int smu_disable_dpms(struct smu_context *smu)<br>
switch (adev->ip_versions[MP1_HWIP][0]) {<br>
case IP_VERSION(13, 0, 0):<br>
case IP_VERSION(13, 0, 7):<br>
- ret = smu_set_mp1_state(smu, PP_MP1_STATE_UNLOAD);<br>
- if (ret) {<br>
- dev_err(adev->dev, "Fail set mp1 state to UNLOAD!\n");<br>
- return ret;<br>
+ if (!(adev->in_runpm || amdgpu_in_reset(adev))) {<br>
+ ret = smu_set_mp1_state(smu, PP_MP1_STATE_UNLOAD);<br>
+ if (ret) {<br>
+ dev_err(adev->dev, "Fail set mp1 state to UNLOAD!\n");<br>
+ return ret;<br>
+ }<br>
}<br>
-<br>
return 0;<br>
default:<br>
break;<br>
--<br>
2.25.1<o:p></o:p></span></p>
</div>
</div>
</div>
</body>
</html>