<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"></style> </head> <body dir="ltr"> <div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr"> <div id="divtagdefaultwrapper" dir="ltr" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, EmojiFont, "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;"> <p style="margin-top:0; margin-bottom:0"></p> </div> <div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Alex Deucher <alexdeucher@gmail.com><br> <b>Sent:</b> Thursday, July 4, 2019 10:58:22 AM<br> <b>To:</b> amd-gfx@lists.freedesktop.org<br> <b>Cc:</b> Deucher, Alexander<br> <b>Subject:</b> [PATCH 2/2] drm/amdgpu/navi10: add thermal sensor support for navi10</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt"> <div class="PlainText">This was dropped when the code was refactored. Re-add it<br> for navi10.<br> <br> Signed-off-by: Alex Deucher <alexander.deucher@amd.com><br> ---<br> drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 42 ++++++++++++++++++++++<br> 1 file changed, 42 insertions(+)<br> <br> diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br> index 5794f7cef1c8..34fbc4be224c 100644<br> --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br> +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c<br> @@ -900,6 +900,42 @@ static int navi10_get_current_activity_percent(struct smu_context *smu,<br> return 0;<br> }<br> <br> +static int navi10_thermal_get_temperature(struct smu_context *smu,<br> + enum amd_pp_sensors sensor,<br> + uint32_t *value)<br> +{<br> + int ret = 0;<br> + SmuMetrics_t metrics;<br> +<br> + if (!value)<br> + return -EINVAL;<br> +<br> + ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, (void *)&metrics,<br> + false);<br> + if (ret)<br> + return ret;<br> +<br> + switch (sensor) {<br> + case AMDGPU_PP_SENSOR_HOTSPOT_TEMP:<br> + *value = metrics.TemperatureHotspot *<br> + SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;<br> + break;<br> + case AMDGPU_PP_SENSOR_EDGE_TEMP:<br> + *value = metrics.TemperatureEdge *<br> + SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;<br> + break;<br> + case AMDGPU_PP_SENSOR_MEM_TEMP:<br> + *value = metrics.TemperatureMem *<br> + SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;</div> <div class="PlainText">[kevin]:</div> <div class="PlainText">the TemperatureMem is not valid for navi10, (it always return 0, it maybe work on HBM type of Memmory, but navi10 is DDR6), </div> <div class="PlainText">and we can use TemperatureVrMem0 to replace it , <span style="font-size: 11pt;">and it is verify on my local side.</span></div> <div class="PlainText"><span style="font-size: 11pt;"><br> </span></div> <div class="PlainText"><span style="font-size: 11pt;">Reviewed-by: Kevin Wang <kevin1.wang@amd.com></span></div> <div class="PlainText"><span style="font-size: 11pt;"><br> </span></div> <div class="PlainText">+ break;<br> + default:<br> + pr_err("Invalid sensor for retrieving temp\n");<br> + return -EINVAL;<br> + }<br> +<br> + return 0;<br> +}<br> +<br> static bool navi10_is_dpm_running(struct smu_context *smu)<br> {<br> int ret = 0;<br> @@ -1280,6 +1316,12 @@ static int navi10_read_sensor(struct smu_context *smu,<br> ret = navi10_get_gpu_power(smu, (uint32_t *)data);<br> *size = 4;<br> break;<br> + case AMDGPU_PP_SENSOR_HOTSPOT_TEMP:<br> + case AMDGPU_PP_SENSOR_EDGE_TEMP:<br> + case AMDGPU_PP_SENSOR_MEM_TEMP:<br> + ret = navi10_thermal_get_temperature(smu, sensor, (uint32_t *)data);<br> + *size = 4;<br> + break;<br> default:<br> return -EINVAL;<br> }<br> -- <br> 2.20.1<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="LPlnk805217" class="OWAAutoLink" previewremoved="true">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a></div> <div id="LPBorder_GT_15622094299570.11102941130760224" style="margin-bottom: 20px; overflow: auto; width: 100%; text-indent: 0px;"> <table id="LPContainer_15622094299540.2215000847637547" role="presentation" cellspacing="0" 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);"> <tbody> <tr valign="top" style="border-spacing: 0px;"> <td id="TextCell_15622094299550.3524786187650355" colspan="2" style="vertical-align: top; position: relative; padding: 0px; display: table-cell;"> <div id="LPRemovePreviewContainer_15622094299550.24225763815885237"></div> <div id="LPTitle_15622094299550.8314314712189494" 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_15622094299550.7160588938640886" href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" target="_blank" style="text-decoration: none;">amd-gfx Info Page - freedesktop.org</a></div> <div id="LPMetadata_15622094299560.8015893318876648" 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_15622094299570.8921265146219484" 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;"> To see the collection of prior postings to the list, visit the amd-gfx Archives.. Using amd-gfx: To post a message to all the list members, send email to amd-gfx@lists.freedesktop.org. You can subscribe to the list, or change your existing subscription, in the sections below.</div> </td> </tr> </tbody> </table> </div> <br> </span></font></div> </div> </body> </html>