Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ab47204 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: refine code for thermal control in powerplay 



add function point start_thermal_controller in hwmgr,
delete thermal function table and related functions

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

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

+4 −2
Original line number Diff line number Diff line
@@ -306,8 +306,10 @@ int phm_start_thermal_controller(struct pp_hwmgr *hwmgr, struct PP_TemperatureRa 
		range.min = temperature_range->min;

	}

	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_ThermalController))

		return phm_dispatch_table(hwmgr, &(hwmgr->start_thermal_controller), &range, NULL);

			PHM_PlatformCaps_ThermalController)

			&& hwmgr->hwmgr_func->start_thermal_controller != NULL)

		return hwmgr->hwmgr_func->start_thermal_controller(hwmgr, &range);



	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ int hwmgr_early_init(struct pp_instance *handle) 
	hwmgr->dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;

	hwmgr_init_default_caps(hwmgr);

	hwmgr_set_user_specify_caps(hwmgr);

	hwmgr->fan_ctrl_is_in_default_mode = true;



	switch (hwmgr->chip_family) {

	case AMDGPU_FAMILY_CZ:

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

+1 −3
Original line number Diff line number Diff line
@@ -2284,7 +2284,6 @@ static int smu7_hwmgr_backend_fini(struct pp_hwmgr *hwmgr) 
{

	kfree(hwmgr->dyn_state.vddc_dep_on_dal_pwrl);

	hwmgr->dyn_state.vddc_dep_on_dal_pwrl = NULL;

	pp_smu7_thermal_fini(hwmgr);

	kfree(hwmgr->backend);

	hwmgr->backend = NULL;
@@ -2301,8 +2300,6 @@ static int smu7_hwmgr_backend_init(struct pp_hwmgr *hwmgr) 
		return -ENOMEM;



	hwmgr->backend = data;

	pp_smu7_thermal_initialize(hwmgr);



	smu7_patch_voltage_workaround(hwmgr);

	smu7_init_dpm_defaults(hwmgr);
@@ -4661,6 +4658,7 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = { 
	.set_power_profile_state = smu7_set_power_profile_state,

	.avfs_control = smu7_avfs_control,

	.disable_smc_firmware_ctf = smu7_thermal_disable_alert,

	.start_thermal_controller = smu7_start_thermal_controller,

};



uint8_t smu7_get_sleep_divider_id_from_clock(uint32_t clock,

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

+20 −126
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int smu7_thermal_initialize(struct pp_hwmgr *hwmgr) 
*

* @param    hwmgr The address of the hardware manager.

*/

int smu7_thermal_enable_alert(struct pp_hwmgr *hwmgr)

static void smu7_thermal_enable_alert(struct pp_hwmgr *hwmgr)

{

	uint32_t alert;
@@ -371,7 +371,7 @@ int smu7_thermal_enable_alert(struct pp_hwmgr *hwmgr) 
			CG_THERMAL_INT, THERM_INT_MASK, alert);



	/* send message to SMU to enable internal thermal interrupts */

	return smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_Thermal_Cntl_Enable);

	smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_Thermal_Cntl_Enable);

}



/**
@@ -416,8 +416,7 @@ int smu7_thermal_stop_thermal_controller(struct pp_hwmgr *hwmgr) 
* @param    Result the last failure code

* @return   result from set temperature range routine

*/

static int tf_smu7_thermal_start_smc_fan_control(struct pp_hwmgr *hwmgr,

		void *input, void *output, void *storage, int result)

static int smu7_thermal_start_smc_fan_control(struct pp_hwmgr *hwmgr)

{

/* If the fantable setup has failed we could have disabled

 * PHM_PlatformCaps_MicrocodeFanControl even after
@@ -432,108 +431,34 @@ static int tf_smu7_thermal_start_smc_fan_control(struct pp_hwmgr *hwmgr, 
	return 0;

}



/**

* Set temperature range for high and low alerts

* @param    hwmgr  the address of the powerplay hardware manager.

* @param    pInput the pointer to input data

* @param    pOutput the pointer to output data

* @param    pStorage the pointer to temporary storage

* @param    Result the last failure code

* @return   result from set temperature range routine

*/

static int tf_smu7_thermal_set_temperature_range(struct pp_hwmgr *hwmgr,

		void *input, void *output, void *storage, int result)

int smu7_start_thermal_controller(struct pp_hwmgr *hwmgr,

				struct PP_TemperatureRange *range)

{

	struct PP_TemperatureRange *range = (struct PP_TemperatureRange *)input;

	int ret = 0;



	if (range == NULL)

		return -EINVAL;



	return smu7_thermal_set_temperature_range(hwmgr, range->min, range->max);

}



/**

* Programs one-time setting registers

* @param    hwmgr  the address of the powerplay hardware manager.

* @param    pInput the pointer to input data

* @param    pOutput the pointer to output data

* @param    pStorage the pointer to temporary storage

* @param    Result the last failure code

* @return   result from initialize thermal controller routine

*/

static int tf_smu7_thermal_initialize(struct pp_hwmgr *hwmgr,

		void *input, void *output, void *storage, int result)

{

	return smu7_thermal_initialize(hwmgr);

}



/**

* Enable high and low alerts

* @param    hwmgr  the address of the powerplay hardware manager.

* @param    pInput the pointer to input data

* @param    pOutput the pointer to output data

* @param    pStorage the pointer to temporary storage

* @param    Result the last failure code

* @return   result from enable alert routine

*/

static int tf_smu7_thermal_enable_alert(struct pp_hwmgr *hwmgr,

		void *input, void *output, void *storage, int result)

{

	return smu7_thermal_enable_alert(hwmgr);

}



/**

* Disable high and low alerts

* @param    hwmgr  the address of the powerplay hardware manager.

* @param    pInput the pointer to input data

* @param    pOutput the pointer to output data

* @param    pStorage the pointer to temporary storage

* @param    Result the last failure code

* @return   result from disable alert routine

*/

static int tf_smu7_thermal_disable_alert(struct pp_hwmgr *hwmgr,

		void *input, void *output, void *storage, int result)

{

	return smu7_thermal_disable_alert(hwmgr);

}

	smu7_thermal_initialize(hwmgr);

	ret = smu7_thermal_set_temperature_range(hwmgr, range->min, range->max);

	if (ret)

		return -EINVAL;

	smu7_thermal_enable_alert(hwmgr);

	ret = smum_thermal_avfs_enable(hwmgr);

	if (ret)

		return -EINVAL;



static const struct phm_master_table_item

phm_thermal_start_thermal_controller_master_list[] = {

	{ .tableFunction = tf_smu7_thermal_initialize },

	{ .tableFunction = tf_smu7_thermal_set_temperature_range },

	{ .tableFunction = tf_smu7_thermal_enable_alert },

	{ .tableFunction = smum_thermal_avfs_enable },

/* We should restrict performance levels to low before we halt the SMC.

 * On the other hand we are still in boot state when we do this

 * so it would be pointless.

 * If this assumption changes we have to revisit this table.

 */

	{ .tableFunction = smum_thermal_setup_fan_table },

	{ .tableFunction = tf_smu7_thermal_start_smc_fan_control },

	{ }

};



static const struct phm_master_table_header

phm_thermal_start_thermal_controller_master = {

	0,

	PHM_MasterTableFlag_None,

	phm_thermal_start_thermal_controller_master_list

};



static const struct phm_master_table_item

phm_thermal_set_temperature_range_master_list[] = {

	{ .tableFunction = tf_smu7_thermal_disable_alert },

	{ .tableFunction = tf_smu7_thermal_set_temperature_range },

	{ .tableFunction = tf_smu7_thermal_enable_alert },

	{ }

};



static const struct phm_master_table_header

phm_thermal_set_temperature_range_master = {

	0,

	PHM_MasterTableFlag_None,

	phm_thermal_set_temperature_range_master_list

};

	smum_thermal_setup_fan_table(hwmgr);

	smu7_thermal_start_smc_fan_control(hwmgr);

	return 0;

}







int smu7_thermal_ctrl_uninitialize_thermal_controller(struct pp_hwmgr *hwmgr)

{
@@ -542,34 +467,3 @@ int smu7_thermal_ctrl_uninitialize_thermal_controller(struct pp_hwmgr *hwmgr) 
	return 0;

}

/**

* Initializes the thermal controller related functions in the Hardware Manager structure.

* @param    hwmgr The address of the hardware manager.

* @exception Any error code from the low-level communication.

*/

int pp_smu7_thermal_initialize(struct pp_hwmgr *hwmgr)

{

	int result;



	result = phm_construct_table(hwmgr,

			&phm_thermal_set_temperature_range_master,

			&(hwmgr->set_temperature_range));



	if (!result) {

		result = phm_construct_table(hwmgr,

				&phm_thermal_start_thermal_controller_master,

				&(hwmgr->start_thermal_controller));

		if (result)

			phm_destroy_table(hwmgr, &(hwmgr->set_temperature_range));

	}



	if (!result)

		hwmgr->fan_ctrl_is_in_default_mode = true;

	return result;

}



void pp_smu7_thermal_fini(struct pp_hwmgr *hwmgr)

{

	phm_destroy_table(hwmgr, &(hwmgr->set_temperature_range));

	phm_destroy_table(hwmgr, &(hwmgr->start_thermal_controller));

}

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

+2 −3
Original line number Diff line number Diff line
@@ -46,14 +46,13 @@ extern int smu7_fan_ctrl_set_default_mode(struct pp_hwmgr *hwmgr); 
extern int smu7_fan_ctrl_set_static_mode(struct pp_hwmgr *hwmgr, uint32_t mode);

extern int smu7_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr, uint32_t speed);

extern int smu7_fan_ctrl_reset_fan_speed_to_default(struct pp_hwmgr *hwmgr);

extern int pp_smu7_thermal_initialize(struct pp_hwmgr *hwmgr);

extern void pp_smu7_thermal_fini(struct pp_hwmgr *hwmgr);

extern int smu7_thermal_ctrl_uninitialize_thermal_controller(struct pp_hwmgr *hwmgr);

extern int smu7_fan_ctrl_set_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t speed);

extern int smu7_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed);

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);

extern int smu7_start_thermal_controller(struct pp_hwmgr *hwmgr,

				struct PP_TemperatureRange *temperature_range);

#endif