Commit a119f87b authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)" 

On some boards the rpm interface apparently does not work at all
leading to the fan not spinning or spinning at strange speeds.
Revert this for now to fix 5.10, 5.11.  The follow on patch
fixes this properly for 5.12.

This reverts commit 8d6e65ad.

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


Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 06ee38dc

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

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ struct pptable_funcs { 
					     *clock_req);

	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

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

				       uint32_t speed);

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

+2 −7
Original line number Diff line number Diff line
@@ -2151,19 +2151,14 @@ 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_rpm) {

		if (speed > 100)

			speed = 100;

		rpm = speed * smu->fan_max_rpm / 100;

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

	}

	if (smu->ppt_funcs->set_fan_speed_percent)

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



	mutex_unlock(&smu->mutex);

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

+1 −0
Original line number Diff line number Diff line
@@ -2326,6 +2326,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -2456,6 +2456,7 @@ 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,