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

drm/amd/powerplay: move more APIs to smu_cmn.c 



Considering they are shared by all ASICs.

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

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

+0 −64
Original line number Diff line number Diff line
@@ -91,43 +91,6 @@ int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask) 
	return ret;

}



int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_t *smu_version)

{

	int ret = 0;



	if (!if_version && !smu_version)

		return -EINVAL;



	if (smu->smc_fw_if_version && smu->smc_fw_version)

	{

		if (if_version)

			*if_version = smu->smc_fw_if_version;



		if (smu_version)

			*smu_version = smu->smc_fw_version;



		return 0;

	}



	if (if_version) {

		ret = smu_send_smc_msg(smu, SMU_MSG_GetDriverIfVersion, if_version);

		if (ret)

			return ret;



		smu->smc_fw_if_version = *if_version;

	}



	if (smu_version) {

		ret = smu_send_smc_msg(smu, SMU_MSG_GetSmuVersion, smu_version);

		if (ret)

			return ret;



		smu->smc_fw_version = *smu_version;

	}



	return ret;

}



int smu_get_status_gfxoff(struct amdgpu_device *adev, uint32_t *value)

{

	int ret = 0;
@@ -184,33 +147,6 @@ int smu_get_dpm_freq_range(struct smu_context *smu, 
	return ret;

}



bool smu_clk_dpm_is_enabled(struct smu_context *smu, enum smu_clk_type clk_type)

{

	enum smu_feature_mask feature_id = 0;



	switch (clk_type) {

	case SMU_MCLK:

	case SMU_UCLK:

		feature_id = SMU_FEATURE_DPM_UCLK_BIT;

		break;

	case SMU_GFXCLK:

	case SMU_SCLK:

		feature_id = SMU_FEATURE_DPM_GFXCLK_BIT;

		break;

	case SMU_SOCCLK:

		feature_id = SMU_FEATURE_DPM_SOCCLK_BIT;

		break;

	default:

		return true;

	}



	if(!smu_feature_is_enabled(smu, feature_id)) {

		return false;

	}



	return true;

}



/**

 * smu_dpm_set_power_gate - power gate/ungate the specific IP block

 *

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

+7 −7
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ static int arcturus_force_clk_levels(struct smu_context *smu, 
	uint32_t smu_version;

	int ret = 0;



	ret = smu_get_smc_version(smu, NULL, &smu_version);

	ret = smu_cmn_get_smc_version(smu, NULL, &smu_version);

	if (ret) {

		dev_err(smu->adev->dev, "Failed to get smu version!\n");

		return ret;
@@ -1191,7 +1191,7 @@ static int arcturus_get_power_profile_mode(struct smu_context *smu, 
	if (!buf)

		return -EINVAL;



	result = smu_get_smc_version(smu, NULL, &smu_version);

	result = smu_cmn_get_smc_version(smu, NULL, &smu_version);

	if (result)

		return result;
@@ -1278,7 +1278,7 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu, 
		return -EINVAL;

	}



	ret = smu_get_smc_version(smu, NULL, &smu_version);

	ret = smu_cmn_get_smc_version(smu, NULL, &smu_version);

	if (ret)

		return ret;
@@ -1362,7 +1362,7 @@ static int arcturus_set_performance_level(struct smu_context *smu, 
	uint32_t smu_version;

	int ret;



	ret = smu_get_smc_version(smu, NULL, &smu_version);

	ret = smu_cmn_get_smc_version(smu, NULL, &smu_version);

	if (ret) {

		dev_err(smu->adev->dev, "Failed to get smu version!\n");

		return ret;
@@ -2106,7 +2106,7 @@ static void arcturus_get_unique_id(struct smu_context *smu) 
	uint32_t top32 = 0, bottom32 = 0, smu_version;

	uint64_t id;



	if (smu_get_smc_version(smu, NULL, &smu_version)) {

	if (smu_cmn_get_smc_version(smu, NULL, &smu_version)) {

		dev_warn(adev->dev, "Failed to get smu version, cannot get unique_id or serial_number\n");

		return;

	}
@@ -2147,7 +2147,7 @@ static int arcturus_set_df_cstate(struct smu_context *smu, 
	uint32_t smu_version;

	int ret;



	ret = smu_get_smc_version(smu, NULL, &smu_version);

	ret = smu_cmn_get_smc_version(smu, NULL, &smu_version);

	if (ret) {

		dev_err(smu->adev->dev, "Failed to get smu version!\n");

		return ret;
@@ -2167,7 +2167,7 @@ static int arcturus_allow_xgmi_power_down(struct smu_context *smu, bool en) 
	uint32_t smu_version;

	int ret;



	ret = smu_get_smc_version(smu, NULL, &smu_version);

	ret = smu_cmn_get_smc_version(smu, NULL, &smu_version);

	if (ret) {

		dev_err(smu->adev->dev, "Failed to get smu version!\n");

		return ret;

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

+0 −2
Original line number Diff line number Diff line
@@ -760,7 +760,6 @@ extern int smu_handle_task(struct smu_context *smu, 
int smu_switch_power_profile(struct smu_context *smu,

			     enum PP_SMC_POWER_PROFILE type,

			     bool en);

int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_t *smu_version);

int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,

			   uint32_t *min, uint32_t *max);

int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
@@ -769,7 +768,6 @@ enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu); 
int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_level level);

int smu_set_display_count(struct smu_context *smu, uint32_t count);

int smu_set_ac_dc(struct smu_context *smu);

bool smu_clk_dpm_is_enabled(struct smu_context *smu, enum smu_clk_type clk_type);

const char *smu_get_message_name(struct smu_context *smu, enum smu_message_type type);

size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf);

int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask);

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

+1 −1
Original line number Diff line number Diff line
@@ -2216,7 +2216,7 @@ static int navi10_disable_umc_cdr_12gbps_workaround(struct smu_context *smu) 
	if (!navi10_need_umc_cdr_12gbps_workaround(smu->adev))

		return 0;



	ret = smu_get_smc_version(smu, NULL, &smu_version);

	ret = smu_cmn_get_smc_version(smu, NULL, &smu_version);

	if (ret)

		return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static int renoir_get_dpm_ultimate_freq(struct smu_context *smu, 
	uint32_t mclk_mask, soc_mask;

	uint32_t clock_limit;



	if (!smu_clk_dpm_is_enabled(smu, clk_type)) {

	if (!smu_cmn_clk_dpm_is_enabled(smu, clk_type)) {

		switch (clk_type) {

		case SMU_MCLK:

		case SMU_UCLK: