Commit e73fc71e authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: correct the fan speed retrieving in PWM for some SMU13 asics 



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: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.0, 6.1
parent 272b9814

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c

+14 −3
Original line number Diff line number Diff line
@@ -1441,12 +1441,23 @@ static void smu_v13_0_0_get_unique_id(struct smu_context *smu) 
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,

	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,

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c

+14 −3
Original line number Diff line number Diff line
@@ -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,

	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,