Commit 5ec36e2d authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/pm: handle fan properly when card is powered down 



Return an error if the user tried to check or set the fan
parameters while the card is powered down (e.g., on a PX/HG
system for example).  This makes the fan consistent with the
temperature stuff.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6f05c4e9

drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

+20 −0
Original line number Diff line number Diff line
@@ -991,6 +991,11 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev, 
	int err;

	int value;



	/* Can't adjust fan when the card is off */

	if  ((adev->flags & AMD_IS_PX) &&

	     (adev->ddev->switch_power_state != DRM_SWITCH_POWER_ON))

		return -EINVAL;



	if (!adev->powerplay.pp_funcs->set_fan_control_mode)

		return -EINVAL;
@@ -1025,6 +1030,11 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev, 
	int err;

	u32 value;



	/* Can't adjust fan when the card is off */

	if  ((adev->flags & AMD_IS_PX) &&

	     (adev->ddev->switch_power_state != DRM_SWITCH_POWER_ON))

		return -EINVAL;



	err = kstrtou32(buf, 10, &value);

	if (err)

		return err;
@@ -1048,6 +1058,11 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev, 
	int err;

	u32 speed = 0;



	/* Can't adjust fan when the card is off */

	if  ((adev->flags & AMD_IS_PX) &&

	     (adev->ddev->switch_power_state != DRM_SWITCH_POWER_ON))

		return -EINVAL;



	if (adev->powerplay.pp_funcs->get_fan_speed_percent) {

		err = amdgpu_dpm_get_fan_speed_percent(adev, &speed);

		if (err)
@@ -1067,6 +1082,11 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev, 
	int err;

	u32 speed = 0;



	/* Can't adjust fan when the card is off */

	if  ((adev->flags & AMD_IS_PX) &&

	     (adev->ddev->switch_power_state != DRM_SWITCH_POWER_ON))

		return -EINVAL;



	if (adev->powerplay.pp_funcs->get_fan_speed_rpm) {

		err = amdgpu_dpm_get_fan_speed_rpm(adev, &speed);

		if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE