drm/amdgpu/pm: wire up hwmon fan speed for smu 14.0.2

Add callbacks for fan speed fetching.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4034
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 90df6db62fa78a8ab0b705ec38db99c7973b95d6)
Cc: stable@vger.kernel.org # 6.12.x

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index 5cad09c5f2ff2c3c1fd1ed727e54476835dd4c6c..e4089fd58711cd1c29d0bde738c1a2ef02c08167 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -1627,6 +1627,39 @@ out:
        adev->unique_id = ((uint64_t)upper32 << 32) | lower32;
 }
 
+static int smu_v14_0_2_get_fan_speed_pwm(struct smu_context *smu,
+                                        uint32_t *speed)
+{
+       int ret;
+
+       if (!speed)
+               return -EINVAL;
+
+       ret = smu_v14_0_2_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, (uint32_t)255);
+
+       return 0;
+}
+
+static int smu_v14_0_2_get_fan_speed_rpm(struct smu_context *smu,
+                                        uint32_t *speed)
+{
+       if (!speed)
+               return -EINVAL;
+
+       return smu_v14_0_2_get_smu_metrics_data(smu,
+                                               METRICS_CURR_FANSPEED,
+                                               speed);
+}
+
 static int smu_v14_0_2_get_power_limit(struct smu_context *smu,
                                       uint32_t *current_power_limit,
                                       uint32_t *default_power_limit,
@@ -2804,6 +2837,8 @@ static const struct pptable_funcs smu_v14_0_2_ppt_funcs = {
        .set_performance_level = smu_v14_0_set_performance_level,
        .gfx_off_control = smu_v14_0_gfx_off_control,
        .get_unique_id = smu_v14_0_2_get_unique_id,
+       .get_fan_speed_pwm = smu_v14_0_2_get_fan_speed_pwm,
+       .get_fan_speed_rpm = smu_v14_0_2_get_fan_speed_rpm,
        .get_power_limit = smu_v14_0_2_get_power_limit,
        .set_power_limit = smu_v14_0_2_set_power_limit,
        .get_power_profile_mode = smu_v14_0_2_get_power_profile_mode,