dgpu: Split out getting temp to a function

Signed-off-by: Tim Crawford <[email protected]>
system76 · Jul 3, 2024 · a91df1e · a91df1e
1 parent 3d09a0b
commit a91df1e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/src/board/system76/common/dgpu.c b/src/board/system76/common/dgpu.c
@@ -59,23 +59,33 @@ void dgpu_init(void) {
     i2c_reset(&I2C_DGPU, true);
 }
 
-uint8_t dgpu_get_fan_duty(void) {
-    uint8_t duty;
-    if (power_state == POWER_STATE_S0 && gpio_get(&DGPU_PWR_EN) && !gpio_get(&GC6_FB_EN)) {
-        // Use I2CS if in S0 state
+bool dgpu_get_temp(int16_t *const data) {
+    if (gpio_get(&DGPU_PWR_EN) && !gpio_get(&GC6_FB_EN)) {
         int8_t rlts;
         int16_t res = i2c_get(&I2C_DGPU, 0x4F, 0x00, &rlts, 1);
         if (res == 1) {
-            dgpu_temp = (int16_t)rlts;
-            duty = fan_duty(&FAN, dgpu_temp);
+            *data = (int16_t)rlts;
+            return true;
         } else {
             DEBUG("DGPU temp error: %d\n", res);
-            // Default to 50% if there is an error
-            dgpu_temp = 0;
+            *data = 0;
+            return false;
+        }
+    }
+
+    *data = 0;
+    return true;
+}
+
+uint8_t dgpu_get_fan_duty(void) {
+    uint8_t duty;
+    if (power_state == POWER_STATE_S0) {
+        if (dgpu_get_temp(&dgpu_temp)) {
+            duty = fan_duty(&FAN, dgpu_temp);
+        } else {
             duty = PWM_DUTY(50);
         }
     } else {
-        // Turn fan off if not in S0 state or GPU power not on
         dgpu_temp = 0;
         duty = PWM_DUTY(0);
     }

diff --git a/src/board/system76/common/include/board/dgpu.h b/src/board/system76/common/include/board/dgpu.h
@@ -3,19 +3,26 @@
 #ifndef _BOARD_DGPU_H
 #define _BOARD_DGPU_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #if CONFIG_HAVE_DGPU
 
 extern int16_t dgpu_temp;
 
 void dgpu_init(void);
+bool dgpu_get_temp(int16_t *const data);
 uint8_t dgpu_get_fan_duty(void);
 
 #else
 
 static inline void dgpu_init(void) {}
 
+static inline bool dgpu_get_temp(int16_t *const data) {
+    *data = 0;
+    return true;
+}
+
 static inline uint8_t dgpu_get_fan_duty(void) {
     return 0;
 }