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

drm/amd/pp: Cleaning up vega10_enable_dpm_tasks function 



1. move display num initialize out of dpm enable tasks.
2. do not set/restore smc telemetry if dpm is runing.

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 af264d02

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

+5 −6
Original line number Diff line number Diff line
@@ -928,6 +928,8 @@ static int vega10_setup_asic_task(struct pp_hwmgr *hwmgr) 
			"Failed to set up led dpm config!",

			return -EINVAL);



	smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_NumOfDisplays, 0);



	return 0;

}
@@ -2857,12 +2859,6 @@ static int vega10_enable_dpm_tasks(struct pp_hwmgr *hwmgr) 
			(struct vega10_hwmgr *)(hwmgr->backend);

	int tmp_result, result = 0;



	smum_send_msg_to_smc_with_parameter(hwmgr,

		PPSMC_MSG_ConfigureTelemetry, data->config_telemetry);



	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_NumOfDisplays, 0);



	tmp_result = (!smum_is_dpm_running(hwmgr)) ? 0 : -1;

	PP_ASSERT_WITH_CODE(!tmp_result,

			"DPM is already running right , skipping re-enablement!",
@@ -2873,6 +2869,9 @@ static int vega10_enable_dpm_tasks(struct pp_hwmgr *hwmgr) 
		smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_UpdatePkgPwrPidAlpha, 1);



	smum_send_msg_to_smc_with_parameter(hwmgr,

		PPSMC_MSG_ConfigureTelemetry, data->config_telemetry);



	tmp_result = vega10_construct_voltage_tables(hwmgr);

	PP_ASSERT_WITH_CODE(!tmp_result,

			"Failed to contruct voltage tables!",