niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/amdgpu/swsmu: handle manual fan readback on SMU11

Browse source 
Need to read back from registers for manual mode rather than
using the metrics table.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1164
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2020-08-27 00:12:38 -04:00
parent 9a7fd01384
commit f6eb433954
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
View file

@ -1123,9 +1123,14 @@ static int arcturus_get_fan_speed_rpm(struct smu_context *smu,
if (!speed) if (!speed)
return -EINVAL; return -EINVAL;
return arcturus_get_smu_metrics_data(smu, switch (smu_v11_0_get_fan_control_mode(smu)) {
METRICS_CURR_FANSPEED, case AMD_FAN_CTRL_AUTO:
speed); return arcturus_get_smu_metrics_data(smu,
METRICS_CURR_FANSPEED,
speed);
default:
return smu_v11_0_get_fan_speed_rpm(smu, speed);
}
} }
static int arcturus_get_fan_parameters(struct smu_context *smu) static int arcturus_get_fan_parameters(struct smu_context *smu)

11
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
View file

@ -1362,9 +1362,14 @@ static int navi10_get_fan_speed_rpm(struct smu_context *smu,
if (!speed) if (!speed)
return -EINVAL; return -EINVAL;
return navi10_get_smu_metrics_data(smu, switch (smu_v11_0_get_fan_control_mode(smu)) {
METRICS_CURR_FANSPEED, case AMD_FAN_CTRL_AUTO:
speed); return navi10_get_smu_metrics_data(smu,
METRICS_CURR_FANSPEED,
speed);
default:
return smu_v11_0_get_fan_speed_rpm(smu, speed);
}
} }
static int navi10_get_fan_parameters(struct smu_context *smu) static int navi10_get_fan_parameters(struct smu_context *smu)

11
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
View file

@ -1169,9 +1169,14 @@ static int sienna_cichlid_get_fan_speed_rpm(struct smu_context *smu,
if (!speed) if (!speed)
return -EINVAL; return -EINVAL;
return sienna_cichlid_get_smu_metrics_data(smu, switch (smu_v11_0_get_fan_control_mode(smu)) {
METRICS_CURR_FANSPEED, case AMD_FAN_CTRL_AUTO:
speed); return sienna_cichlid_get_smu_metrics_data(smu,
METRICS_CURR_FANSPEED,
speed);
default:
return smu_v11_0_get_fan_speed_rpm(smu, speed);
}
} }
static int sienna_cichlid_get_fan_parameters(struct smu_context *smu) static int sienna_cichlid_get_fan_parameters(struct smu_context *smu)