<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">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Acked-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> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Tianci Yin <tianci.yin@amd.com><br>
<b>Sent:</b> Thursday, June 27, 2019 2:49 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> Xiao, Jack; Yin, Tianci (Rico); Zhang, Hawking<br>
<b>Subject:</b> [PATCH] drm/amd/powerplay: update smu11_driver_if_navi10.h</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">From: tiancyin <tianci.yin@amd.com><br>
<br>
update the smu11_driver_if_navi10.h since navi10 smu fw<br>
update to 42.28<br>
<br>
Signed-off-by: tiancyin <tianci.yin@amd.com><br>
---<br>
drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 6 +++---<br>
drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 +-<br>
2 files changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h<br>
index a8b31bc..adbbfeb 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h<br>
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h<br>
@@ -26,7 +26,7 @@<br>
// *** IMPORTANT ***<br>
// SMU TEAM: Always increment the interface version if <br>
// any structure is changed in this file<br>
-#define SMU11_DRIVER_IF_VERSION 0x32<br>
+#define SMU11_DRIVER_IF_VERSION 0x33<br>
<br>
#define PPTABLE_NV10_SMU_VERSION 8<br>
<br>
@@ -813,8 +813,8 @@ typedef struct {<br>
uint16_t UclkAverageLpfTau;<br>
uint16_t GfxActivityLpfTau;<br>
uint16_t UclkActivityLpfTau;<br>
+ uint16_t SocketPowerLpfTau;<br>
<br>
- uint16_t Padding; <br>
// Padding - ignore<br>
uint32_t MmHubPadding[8]; // SMU internal use<br>
} DriverSmuConfig_t;<br>
@@ -853,7 +853,7 @@ typedef struct {<br>
uint8_t CurrGfxVoltageOffset ;<br>
uint8_t CurrMemVidOffset ;<br>
uint8_t Padding8 ;<br>
- uint16_t CurrSocketPower ;<br>
+ uint16_t AverageSocketPower ;<br>
uint16_t TemperatureEdge ;<br>
uint16_t TemperatureHotspot ;<br>
uint16_t TemperatureMem ;<br>
diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br>
index 99566de..373aeba 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br>
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br>
@@ -863,7 +863,7 @@ static int navi10_get_gpu_power(struct smu_context *smu, uint32_t *value)<br>
if (ret)<br>
return ret;<br>
<br>
- *value = metrics.CurrSocketPower << 8;<br>
+ *value = metrics.AverageSocketPower << 8;<br>
<br>
return 0;<br>
}<br>
-- <br>
2.7.4<br>
<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a></div>
</span></font></div>
</body>
</html>