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

drm/amd/pm: drop the unnecessary intermediate percent-based transition 



Currently, the readout of fan speed pwm is transited into percent-based
and then pwm-based. However, the transition into percent-based is totally
unnecessary and make the final output less accurate.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d9ca7567

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 


#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter));



#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))



/* Common functions */

bool amdgpu_device_has_job_running(struct amdgpu_device *adev);

bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+2 −2
Original line number Diff line number Diff line
@@ -306,8 +306,8 @@ struct amd_pm_funcs { 
/* export for sysfs */

	void (*set_fan_control_mode)(void *handle, u32 mode);

	u32 (*get_fan_control_mode)(void *handle);

	int (*set_fan_speed_percent)(void *handle, u32 speed);

	int (*get_fan_speed_percent)(void *handle, u32 *speed);

	int (*set_fan_speed_pwm)(void *handle, u32 speed);

	int (*get_fan_speed_pwm)(void *handle, u32 *speed);

	int (*force_clock_level)(void *handle, enum pp_clock_type type, uint32_t mask);

	int (*print_clock_levels)(void *handle, enum pp_clock_type type, char *buf);

	int (*force_performance_level)(void *handle, enum amd_dpm_forced_level level);

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

+8 −12
Original line number Diff line number Diff line
@@ -2474,10 +2474,8 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev, 
		return err;

	}



	value = (value * 100) / 255;



	if (adev->powerplay.pp_funcs->set_fan_speed_percent)

		err = amdgpu_dpm_set_fan_speed_percent(adev, value);

	if (adev->powerplay.pp_funcs->set_fan_speed_pwm)

		err = amdgpu_dpm_set_fan_speed_pwm(adev, value);

	else

		err = -EINVAL;
@@ -2509,8 +2507,8 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev, 
		return err;

	}



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

		err = amdgpu_dpm_get_fan_speed_percent(adev, &speed);

	if (adev->powerplay.pp_funcs->get_fan_speed_pwm)

		err = amdgpu_dpm_get_fan_speed_pwm(adev, &speed);

	else

		err = -EINVAL;
@@ -2520,8 +2518,6 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev, 
	if (err)

		return err;



	speed = (speed * 255) / 100;



	return sysfs_emit(buf, "%i\n", speed);

}
@@ -3357,13 +3353,13 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 


	if (!is_support_sw_smu(adev)) {

		/* mask fan attributes if we have no bindings for this asic to expose */

		if ((!adev->powerplay.pp_funcs->get_fan_speed_percent &&

		if ((!adev->powerplay.pp_funcs->get_fan_speed_pwm &&

		     attr == &sensor_dev_attr_pwm1.dev_attr.attr) || /* can't query fan */

		    (!adev->powerplay.pp_funcs->get_fan_control_mode &&

		     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr)) /* can't query state */

			effective_mode &= ~S_IRUGO;



		if ((!adev->powerplay.pp_funcs->set_fan_speed_percent &&

		if ((!adev->powerplay.pp_funcs->set_fan_speed_pwm &&

		     attr == &sensor_dev_attr_pwm1.dev_attr.attr) || /* can't manage fan */

		    (!adev->powerplay.pp_funcs->set_fan_control_mode &&

		     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr)) /* can't manage state */
@@ -3387,8 +3383,8 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 


	if (!is_support_sw_smu(adev)) {

		/* hide max/min values if we can't both query and manage the fan */

		if ((!adev->powerplay.pp_funcs->set_fan_speed_percent &&

		     !adev->powerplay.pp_funcs->get_fan_speed_percent) &&

		if ((!adev->powerplay.pp_funcs->set_fan_speed_pwm &&

		     !adev->powerplay.pp_funcs->get_fan_speed_pwm) &&

		     (!adev->powerplay.pp_funcs->set_fan_speed_rpm &&

		     !adev->powerplay.pp_funcs->get_fan_speed_rpm) &&

		    (attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||

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

+4 −4
Original line number Diff line number Diff line
@@ -280,11 +280,11 @@ enum amdgpu_pcie_gen { 
#define amdgpu_dpm_get_fan_control_mode(adev) \

		((adev)->powerplay.pp_funcs->get_fan_control_mode((adev)->powerplay.pp_handle))



#define amdgpu_dpm_set_fan_speed_percent(adev, s) \

		((adev)->powerplay.pp_funcs->set_fan_speed_percent((adev)->powerplay.pp_handle, (s)))

#define amdgpu_dpm_set_fan_speed_pwm(adev, s) \

		((adev)->powerplay.pp_funcs->set_fan_speed_pwm((adev)->powerplay.pp_handle, (s)))



#define amdgpu_dpm_get_fan_speed_percent(adev, s) \

		((adev)->powerplay.pp_funcs->get_fan_speed_percent((adev)->powerplay.pp_handle, (s)))

#define amdgpu_dpm_get_fan_speed_pwm(adev, s) \

		((adev)->powerplay.pp_funcs->get_fan_speed_pwm((adev)->powerplay.pp_handle, (s)))



#define amdgpu_dpm_get_fan_speed_rpm(adev, s) \

		((adev)->powerplay.pp_funcs->get_fan_speed_rpm)((adev)->powerplay.pp_handle, (s))

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

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

	uint32_t fan_mode;

	uint32_t power_limit;

	uint32_t fan_speed_percent;

	uint32_t fan_speed_pwm;

	uint32_t fan_speed_rpm;

	uint32_t flags;

	uint32_t user_od;
@@ -543,7 +543,7 @@ struct smu_context 
	struct work_struct interrupt_work;



	unsigned fan_max_rpm;

	unsigned manual_fan_speed_percent;

	unsigned manual_fan_speed_pwm;



	uint32_t gfx_default_hard_min_freq;

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



	/**

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

	 * @get_fan_speed_pwm: Get the current fan speed in PWM.

	 */

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

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



	/**

	 * @get_fan_speed_rpm: Get the current fan speed in rpm.
@@ -1051,9 +1051,9 @@ struct pptable_funcs { 
	int (*set_fan_control_mode)(struct smu_context *smu, uint32_t mode);



	/**

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

	 * @set_fan_speed_pwm: Set a static fan speed in PWM.

	 */

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

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



	/**

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