<html xmlns:v="urn:schemas-microsoft-com:vml" 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=us-ascii">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p
{mso-style-priority:99;
margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Patch 2 is missing your signed-off-by. With that fixed, the series is:<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Reviewed-by: Alex Deucher <alexander.deucher@amd.com><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org]
<b>On Behalf Of </b>Zhu, Rex<br>
<b>Sent:</b> Friday, May 05, 2017 8:43 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> Zhu, Rex<br>
<b>Subject:</b> Fw: [PATCH 5/5] drm/amd/powerplay: refine pwm1_enable callback functions on CI.<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div id="divtagdefaultwrapper">
<p><span style="font-family:"Calibri","sans-serif";color:black"><o:p> </o:p></span></p>
<div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-size:10.0pt;font-family:"Calibri","sans-serif";color:black">Change-Id: Ieb05cfa95e4072357e18f631ab71780de0688008<br>
Signed-off-by: Rex Zhu <<a href="mailto:Rex.Zhu@amd.com">Rex.Zhu@amd.com</a>><br>
---<br>
drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 27 +++++++++++++++------------<br>
1 file changed, 15 insertions(+), 12 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c<br>
index a6dda34..6dc1410 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c<br>
@@ -1267,30 +1267,33 @@ static int ci_dpm_set_fan_speed_percent(struct amdgpu_device *adev,<br>
<br>
static void ci_dpm_set_fan_control_mode(struct amdgpu_device *adev, u32 mode)<br>
{<br>
- if (mode) {<br>
- /* stop auto-manage */<br>
+ switch (mode) {<br>
+ case AMD_FAN_CTRL_NONE:<br>
if (adev->pm.dpm.fan.ucode_fan_control)<br>
ci_fan_ctrl_stop_smc_fan_control(adev);<br>
- ci_fan_ctrl_set_static_mode(adev, mode);<br>
- } else {<br>
- /* restart auto-manage */<br>
+ ci_dpm_set_fan_speed_percent(adev, 100);<br>
+ break;<br>
+ case AMD_FAN_CTRL_MANUAL:<br>
+ if (adev->pm.dpm.fan.ucode_fan_control)<br>
+ ci_fan_ctrl_stop_smc_fan_control(adev);<br>
+ break;<br>
+ case AMD_FAN_CTRL_AUTO:<br>
if (adev->pm.dpm.fan.ucode_fan_control)<br>
ci_thermal_start_smc_fan_control(adev);<br>
- else<br>
- ci_fan_ctrl_set_default_mode(adev);<br>
+ break;<br>
+ default:<br>
+ break;<br>
}<br>
}<br>
<br>
static u32 ci_dpm_get_fan_control_mode(struct amdgpu_device *adev)<br>
{<br>
struct ci_power_info *pi = ci_get_pi(adev);<br>
- u32 tmp;<br>
<br>
if (pi->fan_is_controlled_by_smc)<br>
- return 0;<br>
-<br>
- tmp = RREG32_SMC(ixCG_FDO_CTRL2) & CG_FDO_CTRL2__FDO_PWM_MODE_MASK;<br>
- return (tmp >> CG_FDO_CTRL2__FDO_PWM_MODE__SHIFT);<br>
+ return AMD_FAN_CTRL_AUTO;<br>
+ else<br>
+ return AMD_FAN_CTRL_MANUAL;<br>
}<br>
<br>
#if 0<br>
-- <br>
1.9.1<o:p></o:p></span></p>
</div>
</div>
</div>
</div>
</div>
</body>
</html>