Commit 4954a76a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/swsmu: use percent rather than rpm for manual fan control (v2) 

On some boards the rpm interface apparently does not work at all
leading to the fan not spinning or spinning at strange speeds.
Both interfaces work properly on the boards I have.
Let's try and use the percent interface instead.

v2: rebase on revert

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1408


Reviewed-by: Evan Quan <evan.quan@amd.com> (v1)
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cd305137

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h

+6 −6
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ enum smu_memory_pool_size 
struct smu_user_dpm_profile {

	uint32_t fan_mode;

	uint32_t power_limit;

	uint32_t fan_speed_rpm;

	uint32_t fan_speed_percent;

	uint32_t flags;



	/* user clock state information */
@@ -472,7 +472,7 @@ struct smu_context 
	struct work_struct interrupt_work;



	unsigned fan_max_rpm;

	unsigned manual_fan_speed_rpm;

	unsigned manual_fan_speed_percent;



	uint32_t gfx_default_hard_min_freq;

	uint32_t gfx_default_soft_max_freq;
@@ -648,9 +648,9 @@ struct pptable_funcs { 
	bool (*is_dpm_running)(struct smu_context *smu);



	/**

	 * @get_fan_speed_rpm: Get the current fan speed in RPM.

	 * @get_fan_speed_percent: Get the current fan speed in percent.

	 */

	int (*get_fan_speed_rpm)(struct smu_context *smu, uint32_t *speed);

	int (*get_fan_speed_percent)(struct smu_context *smu, uint32_t *speed);



	/**

	 * @set_watermarks_table: Configure and upload the watermarks tables to
@@ -951,10 +951,10 @@ struct pptable_funcs { 
	int (*set_fan_control_mode)(struct smu_context *smu, uint32_t mode);



	/**

	 * @set_fan_speed_rpm: Set a static fan speed in RPM.

	 * @set_fan_speed_percent: Set a static fan speed in percent.

	 */

	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t speed);

	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t speed);



	/**

	 * @set_xgmi_pstate: Set inter-chip global memory interconnect pstate.

	 * &pstate: Pstate to set. D0 if Nonzero, D3 otherwise.

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h

+2 −8
Original line number Diff line number Diff line
@@ -203,15 +203,9 @@ int 
smu_v11_0_set_fan_control_mode(struct smu_context *smu,

			       uint32_t mode);



int

smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed);



int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,

int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,

				    uint32_t speed);



int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu,

				uint32_t *speed);



int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,

				     uint32_t pstate);

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+21 −13
Original line number Diff line number Diff line
@@ -368,8 +368,8 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu) 
			return;

		}



		if (!ret && smu->user_dpm_profile.fan_speed_rpm) {

			ret = smu_set_fan_speed_rpm(smu, smu->user_dpm_profile.fan_speed_rpm);

		if (!ret && smu->user_dpm_profile.fan_speed_percent) {

			ret = smu_set_fan_speed_percent(smu, smu->user_dpm_profile.fan_speed_percent);

			if (ret)

				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");

		}
@@ -2025,6 +2025,7 @@ int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled) 


int smu_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed)

{

	u32 percent;

	int ret = 0;



	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2032,10 +2033,11 @@ int smu_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed) 


	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->set_fan_speed_rpm) {

		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);

	if (smu->ppt_funcs->set_fan_speed_percent) {

		percent = speed * 100 / smu->fan_max_rpm;

		ret = smu->ppt_funcs->set_fan_speed_percent(smu, percent);

		if (!ret && smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)

			smu->user_dpm_profile.fan_speed_rpm = speed;

			smu->user_dpm_profile.fan_speed_percent = percent;

	}



	mutex_unlock(&smu->mutex);
@@ -2270,7 +2272,7 @@ int smu_set_fan_control_mode(struct smu_context *smu, int value) 
	/* reset user dpm fan speed */

	if (!ret && value != AMD_FAN_CTRL_MANUAL &&

			smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)

		smu->user_dpm_profile.fan_speed_rpm = 0;

		smu->user_dpm_profile.fan_speed_percent = 0;



	return ret;

}
@@ -2279,17 +2281,15 @@ int smu_get_fan_speed_percent(struct smu_context *smu, uint32_t *speed) 
{

	int ret = 0;

	uint32_t percent;

	uint32_t current_rpm;



	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)

		return -EOPNOTSUPP;



	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->get_fan_speed_rpm) {

		ret = smu->ppt_funcs->get_fan_speed_rpm(smu, &current_rpm);

	if (smu->ppt_funcs->get_fan_speed_percent) {

		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);

		if (!ret) {

			percent = current_rpm * 100 / smu->fan_max_rpm;

			*speed = percent > 100 ? 100 : percent;

		}

	}
@@ -2309,8 +2309,13 @@ int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed) 


	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->set_fan_speed_percent)

	if (smu->ppt_funcs->set_fan_speed_percent) {

		if (speed > 100)

			speed = 100;

		ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);

		if (!ret && smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)

			smu->user_dpm_profile.fan_speed_percent = speed;

	}



	mutex_unlock(&smu->mutex);
@@ -2320,14 +2325,17 @@ int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed) 
int smu_get_fan_speed_rpm(struct smu_context *smu, uint32_t *speed)

{

	int ret = 0;

	u32 percent;



	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)

		return -EOPNOTSUPP;



	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->get_fan_speed_rpm)

		ret = smu->ppt_funcs->get_fan_speed_rpm(smu, speed);

	if (smu->ppt_funcs->get_fan_speed_percent) {

		ret = smu->ppt_funcs->get_fan_speed_percent(smu, &percent);

		*speed = percent * smu->fan_max_rpm / 100;

	}



	mutex_unlock(&smu->mutex);

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+18 −7
Original line number Diff line number Diff line
@@ -1080,15 +1080,27 @@ static int arcturus_read_sensor(struct smu_context *smu, 
	return ret;

}



static int arcturus_get_fan_speed_rpm(struct smu_context *smu,

static int arcturus_get_fan_speed_percent(struct smu_context *smu,

					  uint32_t *speed)

{

	int ret;

	u32 rpm;



	if (!speed)

		return -EINVAL;



	return arcturus_get_smu_metrics_data(smu,

	switch (smu_v11_0_get_fan_control_mode(smu)) {

	case AMD_FAN_CTRL_AUTO:

		ret = arcturus_get_smu_metrics_data(smu,

						    METRICS_CURR_FANSPEED,

					     speed);

						    &rpm);

		if (!ret && smu->fan_max_rpm)

			*speed = rpm * 100 / smu->fan_max_rpm;

		return ret;

	default:

		*speed = smu->user_dpm_profile.fan_speed_percent;

		return 0;

	}

}



static int arcturus_get_fan_parameters(struct smu_context *smu)
@@ -2281,7 +2293,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.print_clk_levels = arcturus_print_clk_levels,

	.force_clk_levels = arcturus_force_clk_levels,

	.read_sensor = arcturus_read_sensor,

	.get_fan_speed_rpm = arcturus_get_fan_speed_rpm,

	.get_fan_speed_percent = arcturus_get_fan_speed_percent,

	.get_power_profile_mode = arcturus_get_power_profile_mode,

	.set_power_profile_mode = arcturus_set_power_profile_mode,

	.set_performance_level = arcturus_set_performance_level,
@@ -2327,7 +2339,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,

	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,

	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,

	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,

	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,

	.gfx_off_control = smu_v11_0_gfx_off_control,

	.register_irq_handler = smu_v11_0_register_irq_handler,

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

+18 −7
Original line number Diff line number Diff line
@@ -1317,15 +1317,27 @@ static bool navi10_is_dpm_running(struct smu_context *smu) 
	return !!(feature_enabled & SMC_DPM_FEATURE);

}



static int navi10_get_fan_speed_rpm(struct smu_context *smu,

static int navi10_get_fan_speed_percent(struct smu_context *smu,

					uint32_t *speed)

{

	int ret;

	u32 rpm;



	if (!speed)

		return -EINVAL;



	return navi10_get_smu_metrics_data(smu,

	switch (smu_v11_0_get_fan_control_mode(smu)) {

	case AMD_FAN_CTRL_AUTO:

		ret = navi10_get_smu_metrics_data(smu,

						  METRICS_CURR_FANSPEED,

					   speed);

						  &rpm);

		if (!ret && smu->fan_max_rpm)

			*speed = rpm * 100 / smu->fan_max_rpm;

		return ret;

	default:

		*speed = smu->user_dpm_profile.fan_speed_percent;

		return 0;

	}

}



static int navi10_get_fan_parameters(struct smu_context *smu)
@@ -2413,7 +2425,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { 
	.display_config_changed = navi10_display_config_changed,

	.notify_smc_display_config = navi10_notify_smc_display_config,

	.is_dpm_running = navi10_is_dpm_running,

	.get_fan_speed_rpm = navi10_get_fan_speed_rpm,

	.get_fan_speed_percent = navi10_get_fan_speed_percent,

	.get_power_profile_mode = navi10_get_power_profile_mode,

	.set_power_profile_mode = navi10_set_power_profile_mode,

	.set_watermarks_table = navi10_set_watermarks_table,
@@ -2457,7 +2469,6 @@ static const struct pptable_funcs navi10_ppt_funcs = { 
	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,

	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,

	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,

	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,

	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,

	.gfx_off_control = smu_v11_0_gfx_off_control,

	.register_irq_handler = smu_v11_0_register_irq_handler,