drm/amd/pm: correct the fan speed retrieving in PWM for some SMU13 asics
authorEvan Quan <evan.quan@amd.com>
Fri, 16 Dec 2022 09:04:24 +0000 (17:04 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 20 Dec 2022 17:47:36 +0000 (12:47 -0500)
For SMU 13.0.0 and 13.0.7, the output from PMFW is in percent. Driver
need to convert that into correct PMW(255) based.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c

index 09a0b41..aebdd97 100644 (file)
@@ -1442,12 +1442,23 @@ out:
 static int smu_v13_0_0_get_fan_speed_pwm(struct smu_context *smu,
                                         uint32_t *speed)
 {
+       int ret;
+
        if (!speed)
                return -EINVAL;
 
-       return smu_v13_0_0_get_smu_metrics_data(smu,
-                                               METRICS_CURR_FANPWM,
-                                               speed);
+       ret = smu_v13_0_0_get_smu_metrics_data(smu,
+                                              METRICS_CURR_FANPWM,
+                                              speed);
+       if (ret) {
+               dev_err(smu->adev->dev, "Failed to get fan speed(PWM)!");
+               return ret;
+       }
+
+       /* Convert the PMFW output which is in percent to pwm(255) based */
+       *speed = MIN(*speed * 255 / 100, 255);
+
+       return 0;
 }
 
 static int smu_v13_0_0_get_fan_speed_rpm(struct smu_context *smu,
index 07e3dc1..5c6c6ad 100644 (file)
@@ -1363,12 +1363,23 @@ static int smu_v13_0_7_populate_umd_state_clk(struct smu_context *smu)
 static int smu_v13_0_7_get_fan_speed_pwm(struct smu_context *smu,
                                         uint32_t *speed)
 {
+       int ret;
+
        if (!speed)
                return -EINVAL;
 
-       return smu_v13_0_7_get_smu_metrics_data(smu,
-                                               METRICS_CURR_FANPWM,
-                                               speed);
+       ret = smu_v13_0_7_get_smu_metrics_data(smu,
+                                              METRICS_CURR_FANPWM,
+                                              speed);
+       if (ret) {
+               dev_err(smu->adev->dev, "Failed to get fan speed(PWM)!");
+               return ret;
+       }
+
+       /* Convert the PMFW output which is in percent to pwm(255) based */
+       *speed = MIN(*speed * 255 / 100, 255);
+
+       return 0;
 }
 
 static int smu_v13_0_7_get_fan_speed_rpm(struct smu_context *smu,