Commit 2fde9ab2 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: refine pwm1_enable callback functions for vi. 



Use the new enums for setting and getting the fan control mode.
Fixes problems due to previous inconsistencies between enums.

Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7522ffc4

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+20 −15
Original line number Diff line number Diff line
@@ -4334,26 +4334,31 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, 


static int smu7_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode)

{

	if (mode) {

		/* stop auto-manage */

	int result = 0;



	switch (mode) {

	case AMD_FAN_CTRL_NONE:

		result = smu7_fan_ctrl_set_fan_speed_percent(hwmgr, 100);

		break;

	case AMD_FAN_CTRL_MANUAL:

		if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_MicrocodeFanControl))

			smu7_fan_ctrl_stop_smc_fan_control(hwmgr);

		smu7_fan_ctrl_set_static_mode(hwmgr, mode);

	} else

		/* restart auto-manage */

		smu7_fan_ctrl_reset_fan_speed_to_default(hwmgr);



	return 0;

			result = smu7_fan_ctrl_stop_smc_fan_control(hwmgr);

		break;

	case AMD_FAN_CTRL_AUTO:

		result = smu7_fan_ctrl_set_static_mode(hwmgr, mode);

		if (!result)

			result = smu7_fan_ctrl_start_smc_fan_control(hwmgr);

		break;

	default:

		break;

	}

	return result;

}



static int smu7_get_fan_control_mode(struct pp_hwmgr *hwmgr)

{

	if (hwmgr->fan_ctrl_is_in_default_mode)

		return hwmgr->fan_ctrl_default_mode;

	else

		return PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,

				CG_FDO_CTRL2, FDO_PWM_MODE);

	return hwmgr->fan_ctrl_enabled ? AMD_FAN_CTRL_AUTO : AMD_FAN_CTRL_MANUAL;

}



static int smu7_get_sclk_od(struct pp_hwmgr *hwmgr)

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c

+5 −4
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ int smu7_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed) 
*/

int smu7_fan_ctrl_set_static_mode(struct pp_hwmgr *hwmgr, uint32_t mode)

{



	if (hwmgr->fan_ctrl_is_in_default_mode) {

		hwmgr->fan_ctrl_default_mode =

				PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
@@ -149,7 +148,7 @@ int smu7_fan_ctrl_set_default_mode(struct pp_hwmgr *hwmgr) 
	return 0;

}



static int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr)

int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr)

{

	int result;
@@ -179,6 +178,7 @@ static int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr) 
				PPSMC_MSG_SetFanTemperatureTarget,

				hwmgr->thermal_controller.

				advanceFanControlParameters.ucTargetTemperature);

	hwmgr->fan_ctrl_enabled = true;



	return result;

}
@@ -186,6 +186,7 @@ static int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr) 


int smu7_fan_ctrl_stop_smc_fan_control(struct pp_hwmgr *hwmgr)

{

	hwmgr->fan_ctrl_enabled = false;

	return smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_StopFanControl);

}
@@ -280,7 +281,7 @@ int smu7_fan_ctrl_set_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t speed) 
	PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,

				CG_TACH_STATUS, TACH_PERIOD, tach_period);



	return smu7_fan_ctrl_set_static_mode(hwmgr, FDO_PWM_MODE_STATIC);

	return smu7_fan_ctrl_set_static_mode(hwmgr, FDO_PWM_MODE_STATIC_RPM);

}



/**

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h

+1 −1
Original line number Diff line number Diff line
@@ -54,6 +54,6 @@ extern int smu7_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *spe 
extern int smu7_fan_ctrl_stop_smc_fan_control(struct pp_hwmgr *hwmgr);

extern int smu7_thermal_enable_alert(struct pp_hwmgr *hwmgr);

extern int smu7_thermal_disable_alert(struct pp_hwmgr *hwmgr);



extern int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr);

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -764,6 +764,7 @@ struct pp_hwmgr { 
	struct pp_thermal_controller_info thermal_controller;

	bool fan_ctrl_is_in_default_mode;

	uint32_t fan_ctrl_default_mode;

	bool fan_ctrl_enabled;

	uint32_t tmin;

	struct phm_microcode_version_info microcode_version_info;

	uint32_t ps_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE