From 5c6278baf78245620b5074c93bc33da2cd474162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Adamczak?=
 <14021+czak@users.noreply.github.com>
Date: Sat, 16 Sep 2023 18:00:51 +0200
Subject: [PATCH] Fix path used for amdgpu hwmon readings

This fixes #1099.
---
 src/overlay.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/overlay.cpp b/src/overlay.cpp
index e6a057cf..ef19fa30 100644
--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -892,26 +892,26 @@ void init_gpu_stats(uint32_t& vendorID, uint32_t reported_deviceID, overlay_para
                if (!amdgpu.gpu_voltage_soc)
                   amdgpu.gpu_voltage_soc = fopen((hwmon_path + dir + "/in0_input").c_str(), "r");
             }
-         }
 
-         if (!metrics_path.empty())
-            break;
+            if (!metrics_path.empty())
+               break;
+
+            // The card output nodes - cardX-output, will point to the card node
+            // As such the actual metrics nodes will be missing.
+            amdgpu.busy = fopen((device_path + "/gpu_busy_percent").c_str(), "r");
+            if (!amdgpu.busy)
+               continue;
 
-         // The card output nodes - cardX-output, will point to the card node
-         // As such the actual metrics nodes will be missing.
-         amdgpu.busy = fopen((device_path + "/gpu_busy_percent").c_str(), "r");
-         if (!amdgpu.busy)
-            continue;
-
-         SPDLOG_DEBUG("using amdgpu path: {}", device_path);
-
-         for (const auto& dir : dirs) {
-            if (!amdgpu.memory_clock)
-               amdgpu.memory_clock = fopen((hwmon_path + dir + "/freq2_input").c_str(), "r");
-            if (!amdgpu.power_usage)
-               amdgpu.power_usage = fopen((hwmon_path + dir + "/power1_average").c_str(), "r");
-            if (!amdgpu.fan)
-               amdgpu.fan = fopen((hwmon_path + dir + "/fan1_input").c_str(), "r");
+            SPDLOG_DEBUG("using amdgpu path: {}", device_path);
+
+            for (const auto& dir : dirs) {
+               if (!amdgpu.memory_clock)
+                  amdgpu.memory_clock = fopen((hwmon_path + dir + "/freq2_input").c_str(), "r");
+               if (!amdgpu.power_usage)
+                  amdgpu.power_usage = fopen((hwmon_path + dir + "/power1_average").c_str(), "r");
+               if (!amdgpu.fan)
+                  amdgpu.fan = fopen((hwmon_path + dir + "/fan1_input").c_str(), "r");
+            }
          }
          break;
       }