Mesa (master): gallium/hud: fix power sensor readings for amdgpu users

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 25a3ce97d5237659ceda50f54ac2623f974d8b7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=25a3ce97d5237659ceda50f54ac2623f974d8b7e

Author: Andre Heider <a.heider at gmail.com>
Date:   Sat Oct 27 09:45:37 2018 +0200

gallium/hud: fix power sensor readings for amdgpu users

amdgpu doesn't use the INPUT but the AVERAGE subfeature:

$ sensors -u
amdgpu-pci-0100
Adapter: PCI adapter
power1:
  power1_average: 17.233
  power1_cap: 180.000

Signed-off-by: Andre Heider <a.heider at gmail.com>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/auxiliary/hud/hud_sensors_temp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/auxiliary/hud/hud_sensors_temp.c b/src/gallium/auxiliary/hud/hud_sensors_temp.c
index c26e7b9b2a..c226e89cc4 100644
--- a/src/gallium/auxiliary/hud/hud_sensors_temp.c
+++ b/src/gallium/auxiliary/hud/hud_sensors_temp.c
@@ -122,6 +122,9 @@ get_sensor_values(struct sensors_temp_info *sti)
    case SENSORS_POWER_CURRENT:
       sf = sensors_get_subfeature(sti->chip, sti->feature,
                                   SENSORS_SUBFEATURE_POWER_INPUT);
+      if (!sf)
+          sf = sensors_get_subfeature(sti->chip, sti->feature,
+                                      SENSORS_SUBFEATURE_POWER_AVERAGE);
       if (sf) {
          /* Sensors API returns in WATTs, even though driver is reporting mW,
           * convert back to mW */