On Wed, Oct 21, 2020 at 2:45 AM Kenneth Feng <kenneth.feng@xxxxxxx> wrote: > > fix the wrong fan speed in fan1_input when the fan control mode is manual. > the fan speed value is not correct when we set manual mode to fan1_enalbe - 1. > since the fan speed in the metrics table always reflects the real fan speed,we > can fetch the fan speed for both auto and manual mode. > > Signed-off-by: Kenneth Feng <kenneth.feng@xxxxxxx> NACK. At least on the navi boards I have, the metrics table fan speed reads back 0 when the fan is in manual mode. That's why I changed this in the first place. Alex > --- > .../gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > index 496abc31b07e..27b6cade9ade 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > @@ -1171,14 +1171,9 @@ static int sienna_cichlid_get_fan_speed_rpm(struct smu_context *smu, > if (!speed) > return -EINVAL; > > - switch (smu_v11_0_get_fan_control_mode(smu)) { > - case AMD_FAN_CTRL_AUTO: > - return sienna_cichlid_get_smu_metrics_data(smu, > - METRICS_CURR_FANSPEED, > - speed); > - default: > - return smu_v11_0_get_fan_speed_rpm(smu, speed); > - } > + return sienna_cichlid_get_smu_metrics_data(smu, > + METRICS_CURR_FANSPEED, > + speed); > } > > static int sienna_cichlid_get_fan_parameters(struct smu_context *smu) > -- > 2.17.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx