<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">Series is Reviewed-by: <span style="font-family: Calibri, Helvetica, sans-serif, serif, EmojiFont; font-size: 14.6667px;"> Rex Zhu <Rex.Zhu@amd.com></span></p>
<p style="margin-top:0;margin-bottom:0"><span style="font-family: Calibri, Helvetica, sans-serif, serif, EmojiFont; font-size: 14.6667px;"><br>
</span></p>
<p style="margin-top:0;margin-bottom:0"><span style="font-family: Calibri, Helvetica, sans-serif, serif, EmojiFont; font-size: 14.6667px;">Best Regards</span></p>
<p style="margin-top:0;margin-bottom:0"><span style="font-family: Calibri, Helvetica, sans-serif, serif, EmojiFont; font-size: 14.6667px;">Rex</span></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 face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Alex Deucher <alexdeucher@gmail.com><br>
<b>Sent:</b> Thursday, January 25, 2018 7:55 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> Deucher, Alexander<br>
<b>Subject:</b> [PATCH 6/6] drm/amdgpu/pm: rework the hwmon visibility settings</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Previously we just always exposed everything for asics<br>
supported by powerplay. Make it a bit more fine grained.<br>
In practice this shouldn't change anything.<br>
<br>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 30 +++++++++++++++++-------------<br>
1 file changed, 17 insertions(+), 13 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c<br>
index 6c53c6bc03eb..f12b9e777703 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c<br>
@@ -1246,9 +1246,19 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj,<br>
struct amdgpu_device *adev = dev_get_drvdata(dev);<br>
umode_t effective_mode = attr->mode;<br>
<br>
- /* no skipping for powerplay */<br>
- if (adev->powerplay.cgs_device)<br>
- return effective_mode;<br>
+ /* handle non-powerplay limitations */<br>
+ if (!adev->powerplay.cgs_device) {<br>
+ /* Skip fan attributes if fan is not present */<br>
+ if (adev->pm.no_fan &&<br>
+ (attr == &sensor_dev_attr_pwm1.dev_attr.attr ||<br>
+ attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||<br>
+ attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||<br>
+ attr == &sensor_dev_attr_pwm1_min.dev_attr.attr))<br>
+ return 0;<br>
+ /* requires powerplay */<br>
+ if (attr == &sensor_dev_attr_fan1_input.dev_attr.attr)<br>
+ return 0;<br>
+ }<br>
<br>
/* Skip limit attributes if DPM is not enabled */<br>
if (!adev->pm.dpm_enabled &&<br>
@@ -1260,14 +1270,6 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj,<br>
attr == &sensor_dev_attr_pwm1_min.dev_attr.attr))<br>
return 0;<br>
<br>
- /* Skip fan attributes if fan is not present */<br>
- if (adev->pm.no_fan &&<br>
- (attr == &sensor_dev_attr_pwm1.dev_attr.attr ||<br>
- attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||<br>
- attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||<br>
- attr == &sensor_dev_attr_pwm1_min.dev_attr.attr))<br>
- return 0;<br>
-<br>
/* mask fan attributes if we have no bindings for this asic to expose */<br>
if ((!adev->powerplay.pp_funcs->get_fan_speed_percent &&<br>
attr == &sensor_dev_attr_pwm1.dev_attr.attr) || /* can't query fan */<br>
@@ -1288,8 +1290,10 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj,<br>
attr == &sensor_dev_attr_pwm1_min.dev_attr.attr))<br>
return 0;<br>
<br>
- /* requires powerplay */<br>
- if (attr == &sensor_dev_attr_fan1_input.dev_attr.attr)<br>
+ /* only APUs have vddnb */<br>
+ if (!(adev->flags & AMD_IS_APU) &&<br>
+ (attr == &sensor_dev_attr_in1_input.dev_attr.attr ||<br>
+ attr == &sensor_dev_attr_in1_label.dev_attr.attr))<br>
return 0;<br>
<br>
return effective_mode;<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="LPlnk598724" previewremoved="true">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a>
<div id="LPBorder_GT_15168478634930.5968332029337928" style="margin-bottom: 20px; overflow: auto; width: 100%; text-indent: 0px;">
<table id="LPContainer_15168478634900.13712077124056088" 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_15168478634910.924534069345174" colspan="2" style="vertical-align: top; position: relative; padding: 0px; display: table-cell;">
<div id="LPRemovePreviewContainer_15168478634910.1709027748938059"></div>
<div id="LPTitle_15168478634910.8498868611745234" style="top: 0px; color: rgb(0, 120, 215); font-weight: normal; 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_15168478634920.2896285752466594" 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_15168478634920.3563010283805921" style="margin: 10px 0px 16px; color: rgb(102, 102, 102); font-weight: normal; 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_15168478634920.6766152807229358" style="display: block; color: rgb(102, 102, 102); font-weight: normal; 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 ...</div>
</td>
</tr>
</tbody>
</table>
</div>
<br>
<br>
</div>
</span></font></div>
</div>
</div>
</body>
</html>