Commit 1bcff326 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/smu: move fan rpm query into the asic specific code 



On vega20, there is an SMU message to query it.  On navi, it's fetched
from the metrics table.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev, 
		return -EINVAL;



	if (is_support_sw_smu(adev)) {

		err = smu_get_current_rpm(&adev->smu, &speed);

		err = smu_get_fan_speed_rpm(&adev->smu, &speed);

		if (err)

			return err;

	} else if (adev->powerplay.pp_funcs->get_fan_speed_rpm) {
@@ -1794,7 +1794,7 @@ static ssize_t amdgpu_hwmon_get_fan1_target(struct device *dev, 
		return -EINVAL;



	if (is_support_sw_smu(adev)) {

		err = smu_get_current_rpm(&adev->smu, &rpm);

		err = smu_get_fan_speed_rpm(&adev->smu, &rpm);

		if (err)

			return err;

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

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

+3 −3
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ struct pptable_funcs { 
	int (*tables_init)(struct smu_context *smu, struct smu_table *tables);

	int (*set_thermal_fan_table)(struct smu_context *smu);

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

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

	int (*set_watermarks_table)(struct smu_context *smu, void *watermarks,

				    struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges);

	int (*get_current_clk_freq_by_table)(struct smu_context *smu,
@@ -686,7 +687,6 @@ struct smu_funcs 
	int (*set_watermarks_for_clock_ranges)(struct smu_context *smu,

					       struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges);

	int (*conv_power_profile_to_pplib_workload)(int power_profile);

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

	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);
@@ -752,8 +752,6 @@ struct smu_funcs 
	((smu)->funcs->init_max_sustainable_clocks ? (smu)->funcs->init_max_sustainable_clocks((smu)) : 0)

#define smu_set_default_od_settings(smu, initialize) \

	((smu)->ppt_funcs->set_default_od_settings ? (smu)->ppt_funcs->set_default_od_settings((smu), (initialize)) : 0)

#define smu_get_current_rpm(smu, speed) \

	((smu)->funcs->get_current_rpm ? (smu)->funcs->get_current_rpm((smu), (speed)) : 0)

#define smu_set_fan_speed_rpm(smu, speed) \

	((smu)->funcs->set_fan_speed_rpm ? (smu)->funcs->set_fan_speed_rpm((smu), (speed)) : 0)

#define smu_send_smc_msg(smu, msg) \
@@ -842,6 +840,8 @@ struct smu_funcs 
	((smu)->ppt_funcs->get_fan_speed_percent ? (smu)->ppt_funcs->get_fan_speed_percent((smu), (speed)) : 0)

#define smu_set_fan_speed_percent(smu, speed) \

	((smu)->funcs->set_fan_speed_percent ? (smu)->funcs->set_fan_speed_percent((smu), (speed)) : 0)

#define smu_get_fan_speed_rpm(smu, speed) \

	((smu)->ppt_funcs->get_fan_speed_rpm ? (smu)->ppt_funcs->get_fan_speed_rpm((smu), (speed)) : 0)



#define smu_msg_get_index(smu, msg) \

	((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_msg_index? (smu)->ppt_funcs->get_smu_msg_index((smu), (msg)) : -EINVAL) : -EINVAL)

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+7 −5
Original line number Diff line number Diff line
@@ -954,12 +954,13 @@ static bool navi10_is_dpm_running(struct smu_context *smu) 
	return !!(feature_enabled & SMC_DPM_FEATURE);

}



static int navi10_get_fan_speed(struct smu_context *smu, uint16_t *value)

static int navi10_get_fan_speed_rpm(struct smu_context *smu,

				    uint32_t *speed)

{

	SmuMetrics_t metrics;

	int ret = 0;



	if (!value)

	if (!speed)

		return -EINVAL;



	memset(&metrics, 0, sizeof(metrics));
@@ -969,7 +970,7 @@ static int navi10_get_fan_speed(struct smu_context *smu, uint16_t *value) 
	if (ret)

		return ret;



	*value = metrics.CurrFanSpeed;

	*speed = metrics.CurrFanSpeed;



	return ret;

}
@@ -979,10 +980,10 @@ static int navi10_get_fan_speed_percent(struct smu_context *smu, 
{

	int ret = 0;

	uint32_t percent = 0;

	uint16_t current_rpm;

	uint32_t current_rpm;

	PPTable_t *pptable = smu->smu_table.driver_pptable;



	ret = navi10_get_fan_speed(smu, &current_rpm);

	ret = navi10_get_fan_speed_rpm(smu, &current_rpm);

	if (ret)

		return ret;
@@ -1646,6 +1647,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { 
	.unforce_dpm_levels = navi10_unforce_dpm_levels,

	.is_dpm_running = navi10_is_dpm_running,

	.get_fan_speed_percent = navi10_get_fan_speed_percent,

	.get_fan_speed_rpm = navi10_get_fan_speed_rpm,

	.get_power_profile_mode = navi10_get_power_profile_mode,

	.set_power_profile_mode = navi10_set_power_profile_mode,

	.get_profiling_clk_mask = navi10_get_profiling_clk_mask,

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+0 −18
Original line number Diff line number Diff line
@@ -1371,23 +1371,6 @@ static int smu_v11_0_gfx_off_control(struct smu_context *smu, bool enable) 
	return ret;

}



static int smu_v11_0_get_current_rpm(struct smu_context *smu,

				     uint32_t *current_rpm)

{

	int ret;



	ret = smu_send_smc_msg(smu, SMU_MSG_GetCurrentRpm);



	if (ret) {

		pr_err("Attempt to get current RPM from SMC Failed!\n");

		return ret;

	}



	smu_read_smc_arg(smu, current_rpm);



	return 0;

}



static uint32_t

smu_v11_0_get_fan_control_mode(struct smu_context *smu)

{
@@ -1773,7 +1756,6 @@ static const struct smu_funcs smu_v11_0_funcs = { 
	.set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk,

	.display_clock_voltage_request = smu_v11_0_display_clock_voltage_request,

	.set_watermarks_for_clock_ranges = smu_v11_0_set_watermarks_for_clock_ranges,

	.get_current_rpm = smu_v11_0_get_current_rpm,

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

drivers/gpu/drm/amd/powerplay/vega20_ppt.c

+19 −1
Original line number Diff line number Diff line
@@ -3015,6 +3015,23 @@ static int vega20_set_thermal_fan_table(struct smu_context *smu) 
	return ret;

}



static int vega20_get_fan_speed_rpm(struct smu_context *smu,

				    uint32_t *speed)

{

	int ret;



	ret = smu_send_smc_msg(smu, SMU_MSG_GetCurrentRpm);



	if (ret) {

		pr_err("Attempt to get current RPM from SMC Failed!\n");

		return ret;

	}



	smu_read_smc_arg(smu, speed);



	return 0;

}



static int vega20_get_fan_speed_percent(struct smu_context *smu,

					uint32_t *speed)

{
@@ -3022,7 +3039,7 @@ static int vega20_get_fan_speed_percent(struct smu_context *smu, 
	uint32_t current_rpm = 0, percent = 0;

	PPTable_t *pptable = smu->smu_table.driver_pptable;



	ret = smu_get_current_rpm(smu, &current_rpm);

	ret = vega20_get_fan_speed_rpm(smu, &current_rpm);

	if (ret)

		return ret;
@@ -3293,6 +3310,7 @@ static const struct pptable_funcs vega20_ppt_funcs = { 
	.is_dpm_running = vega20_is_dpm_running,

	.set_thermal_fan_table = vega20_set_thermal_fan_table,

	.get_fan_speed_percent = vega20_get_fan_speed_percent,

	.get_fan_speed_rpm = vega20_get_fan_speed_rpm,

	.set_watermarks_table = vega20_set_watermarks_table,

	.get_thermal_temperature_range = vega20_get_thermal_temperature_range

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE