<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr">
<p style="margin-top:0;margin-bottom:0"><font size="3" color="black" face="Calibri,Helvetica,sans-serif"><span style="font-size:12pt;" id="divtagdefaultwrapper"></p>
<div>Reviewed-by: Rex Zhu<rezhu@amd.com>  <br>
</div>
</span></font>
<p></p>
<p style="margin-top:0;margin-bottom:0"><font size="3" color="black" face="Calibri,Helvetica,sans-serif"><span style="font-size:12pt;" id="divtagdefaultwrapper"><br>
</span></font></p>
<p style="margin-top:0;margin-bottom:0"><font size="3" color="black" face="Calibri,Helvetica,sans-serif"><span style="font-size:12pt;" id="divtagdefaultwrapper"><br>
</span></font></p>
<p style="margin-top:0;margin-bottom:0"><font size="3" color="black" face="Calibri,Helvetica,sans-serif"><span style="font-size:12pt;" id="divtagdefaultwrapper">Best Regards</span></font></p>
<p style="margin-top:0;margin-bottom:0"><font size="3" color="black" face="Calibri,Helvetica,sans-serif"><span style="font-size:12pt;" id="divtagdefaultwrapper">Rex</span></font><br>
</p>
<br>
<br>
<div style="color: rgb(0, 0, 0);">
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" color="#000000" face="Calibri, sans-serif"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Alex Deucher <alexdeucher@gmail.com><br>
<b>Sent:</b> Friday, June 1, 2018 1:48 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> Deucher, Alexander<br>
<b>Subject:</b> [PATCH] drm/amdgpu/pp: switch the default dpm implementation for CI</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Switch hawaii and bonaire to use powerplay rather than the old<br>
dpm implementation.  Powerplay supports more features and is<br>
better maintained.  Ultimately, we can drop the older dpm<br>
implementation like we did for other older asics.<br>
<br>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com><br>
---<br>
 drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++----<br>
 1 file changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c<br>
index 8ff4c60d1b59..702e257a483f 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/cik.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c<br>
@@ -2003,9 +2003,9 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)<br>
                 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);<br>
                 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);<br>
                 if (amdgpu_dpm == -1)<br>
-                       amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);<br>
-               else<br>
                         amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);<br>
+               else<br>
+                       amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);<br>
                 if (adev->enable_virtual_display)<br>
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);<br>
 #if defined(CONFIG_DRM_AMD_DC)<br>
@@ -2024,9 +2024,9 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)<br>
                 amdgpu_device_ip_block_add(adev, &gmc_v7_0_ip_block);<br>
                 amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);<br>
                 if (amdgpu_dpm == -1)<br>
-                       amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);<br>
-               else<br>
                         amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);<br>
+               else<br>
+                       amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);<br>
                 if (adev->enable_virtual_display)<br>
                         amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);<br>
 #if defined(CONFIG_DRM_AMD_DC)<br>
-- <br>
2.13.6<br>
<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" id="LPlnk373730" class="OWAAutoLink" previewremoved="true">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a>
<div id="LPBorder_GT_15278222769520.7963180601898863" style="margin-bottom: 20px; overflow: auto; width: 100%; text-indent: 0px;">
<table id="LPContainer_15278222769480.5549004450515355" style="width: 90%; background-color: rgb(255, 255, 255); position: relative; overflow: auto; padding-top: 20px; padding-bottom: 20px; margin-top: 20px; border-top: 1px dotted rgb(200, 200, 200); border-bottom: 1px dotted rgb(200, 200, 200);" role="presentation" cellspacing="0">
<tbody>
<tr style="border-spacing: 0px;" valign="top">
<td id="TextCell_15278222769500.930042975354877" style="vertical-align: top; position: relative; padding: 0px; display: table-cell;" colspan="2">
<div id="LPRemovePreviewContainer_15278222769500.9392457538432804"></div>
<div id="LPTitle_15278222769500.942350061124624" style="top: 0px; color: rgb(0, 120, 215); font-weight: 400; font-size: 21px; font-family: "wf_segoe-ui_light", "Segoe UI Light", "Segoe WP Light", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif; line-height: 21px;">
<a id="LPUrlAnchor_15278222769500.43557172860173976" style="text-decoration: none;" href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" target="_blank">amd-gfx Info Page - freedesktop.org</a></div>
<div id="LPMetadata_15278222769500.2350845128372695" style="margin: 10px 0px 16px; color: rgb(102, 102, 102); font-weight: 400; font-family: "wf_segoe-ui_normal", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif; font-size: 14px; line-height: 14px;">
lists.freedesktop.org</div>
<div id="LPDescription_15278222769500.8382167637248685" style="display: block; color: rgb(102, 102, 102); font-weight: 400; font-family: "wf_segoe-ui_normal", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif; font-size: 14px; line-height: 20px; max-height: 100px; overflow: hidden;">
Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the following form. Use of all freedesktop.org lists is subject to our Code of Conduct.</div>
</td>
</tr>
</tbody>
</table>
</div>
<br>
</div>
</span></font></div>
</div>
</div>
</body>
</html>