Commit 8d6e65ad authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/swsmu: drop set_fan_speed_percent (v2) 



No longer needed as we can calculate it based on
the fan's max rpm.

v2: minor code rework

Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eff64742

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

+0 −1
Original line number Diff line number Diff line
@@ -573,7 +573,6 @@ struct pptable_funcs { 
	int (*conv_power_profile_to_pplib_workload)(int power_profile);

	uint32_t (*get_fan_control_mode)(struct smu_context *smu);

	int (*set_fan_control_mode)(struct smu_context *smu, uint32_t mode);

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

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

	int (*set_xgmi_pstate)(struct smu_context *smu, uint32_t pstate);

	int (*gfx_off_control)(struct smu_context *smu, bool enable);

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

+0 −3
Original line number Diff line number Diff line
@@ -200,9 +200,6 @@ 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,

				       uint32_t speed);

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

+7 −2
Original line number Diff line number Diff line
@@ -2217,14 +2217,19 @@ int smu_get_fan_speed_percent(struct smu_context *smu, uint32_t *speed) 
int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)

{

	int ret = 0;

	uint32_t rpm;



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

		return -EOPNOTSUPP;



	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->set_fan_speed_percent)

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

	if (smu->ppt_funcs->set_fan_speed_rpm) {

		if (speed > 100)

			speed = 100;

		rpm = speed * smu->fan_max_rpm / 100;

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

	}



	mutex_unlock(&smu->mutex);

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

+0 −1
Original line number Diff line number Diff line
@@ -2363,7 +2363,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.display_clock_voltage_request = smu_v11_0_display_clock_voltage_request,

	.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,

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

+0 −1
Original line number Diff line number Diff line
@@ -2631,7 +2631,6 @@ static const struct pptable_funcs navi10_ppt_funcs = { 
	.display_clock_voltage_request = smu_v11_0_display_clock_voltage_request,

	.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,