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

drm/amd/powerplay: move SMC message issuing APIs to smu_cmn.c 



Considering they can be 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 c1b353b7

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

+0 −13
Original line number Diff line number Diff line
@@ -46,19 +46,6 @@ 
#undef pr_info

#undef pr_debug



#undef __SMU_DUMMY_MAP

#define __SMU_DUMMY_MAP(type)	#type

static const char* __smu_message_names[] = {

	SMU_MESSAGE_TYPES

};



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

{

	if (type < 0 || type >= SMU_MSG_MAX_COUNT)

		return "unknown smu message";

	return __smu_message_names[type];

}



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

{

	size_t size = 0;

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

+13 −12
Original line number Diff line number Diff line
@@ -455,13 +455,13 @@ static int arcturus_run_btc(struct smu_context *smu) 
{

	int ret = 0;



	ret = smu_send_smc_msg(smu, SMU_MSG_RunAfllBtc, NULL);

	ret = smu_cmn_send_smc_msg(smu, SMU_MSG_RunAfllBtc, NULL);

	if (ret) {

		dev_err(smu->adev->dev, "RunAfllBtc failed!\n");

		return ret;

	}



	return smu_send_smc_msg(smu, SMU_MSG_RunDcBtc, NULL);

	return smu_cmn_send_smc_msg(smu, SMU_MSG_RunDcBtc, NULL);

}



static int arcturus_populate_umd_state_clk(struct smu_context *smu)
@@ -839,7 +839,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu, 
	if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT) &&

	    (feature_mask & FEATURE_DPM_GFXCLK_MASK)) {

		freq = dpm_context->dpm_tables.gfx_table.dpm_levels[level].value;

		ret = smu_send_smc_msg_with_param(smu,

		ret = smu_cmn_send_smc_msg_with_param(smu,

			(max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq),

			(PPCLK_GFXCLK << 16) | (freq & 0xffff),

			NULL);
@@ -853,7 +853,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu, 
	if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_UCLK_BIT) &&

	    (feature_mask & FEATURE_DPM_UCLK_MASK)) {

		freq = dpm_context->dpm_tables.uclk_table.dpm_levels[level].value;

		ret = smu_send_smc_msg_with_param(smu,

		ret = smu_cmn_send_smc_msg_with_param(smu,

			(max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq),

			(PPCLK_UCLK << 16) | (freq & 0xffff),

			NULL);
@@ -867,7 +867,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu, 
	if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_SOCCLK_BIT) &&

	    (feature_mask & FEATURE_DPM_SOCCLK_MASK)) {

		freq = dpm_context->dpm_tables.soc_table.dpm_levels[level].value;

		ret = smu_send_smc_msg_with_param(smu,

		ret = smu_cmn_send_smc_msg_with_param(smu,

			(max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq),

			(PPCLK_SOCCLK << 16) | (freq & 0xffff),

			NULL);
@@ -1358,7 +1358,7 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu, 
		return -EINVAL;

	}



	ret = smu_send_smc_msg_with_param(smu,

	ret = smu_cmn_send_smc_msg_with_param(smu,

					  SMU_MSG_SetWorkloadMask,

					  1 << workload_type,

					  NULL);
@@ -2134,8 +2134,8 @@ static void arcturus_get_unique_id(struct smu_context *smu) 
	}



	/* Get the SN to turn into a Unique ID */

	smu_send_smc_msg(smu, SMU_MSG_ReadSerialNumTop32, &top32);

	smu_send_smc_msg(smu, SMU_MSG_ReadSerialNumBottom32, &bottom32);

	smu_cmn_send_smc_msg(smu, SMU_MSG_ReadSerialNumTop32, &top32);

	smu_cmn_send_smc_msg(smu, SMU_MSG_ReadSerialNumBottom32, &bottom32);



	id = ((uint64_t)bottom32 << 32) | top32;

	adev->unique_id = id;
@@ -2175,7 +2175,7 @@ static int arcturus_set_df_cstate(struct smu_context *smu, 
		return -EINVAL;

	}



	return smu_send_smc_msg_with_param(smu, SMU_MSG_DFCstateControl, state, NULL);

	return smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_DFCstateControl, state, NULL);

}



static int arcturus_allow_xgmi_power_down(struct smu_context *smu, bool en)
@@ -2196,12 +2196,12 @@ static int arcturus_allow_xgmi_power_down(struct smu_context *smu, bool en) 
	}



	if (en)

		return smu_send_smc_msg_with_param(smu,

		return smu_cmn_send_smc_msg_with_param(smu,

						   SMU_MSG_GmiPwrDnControl,

						   1,

						   NULL);



	return smu_send_smc_msg_with_param(smu,

	return smu_cmn_send_smc_msg_with_param(smu,

					   SMU_MSG_GmiPwrDnControl,

					   0,

					   NULL);
@@ -2294,7 +2294,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.set_tool_table_location = smu_v11_0_set_tool_table_location,

	.notify_memory_pool_location = smu_v11_0_notify_memory_pool_location,

	.system_features_control = smu_v11_0_system_features_control,

	.send_smc_msg_with_param = smu_v11_0_send_msg_with_param,

	.send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param,

	.send_smc_msg = smu_cmn_send_smc_msg,

	.init_display_count = NULL,

	.set_allowed_mask = smu_v11_0_set_allowed_mask,

	.get_enabled_mask = smu_cmn_get_enabled_mask,

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

+3 −1
Original line number Diff line number Diff line
@@ -528,6 +528,9 @@ struct pptable_funcs { 
	int (*system_features_control)(struct smu_context *smu, bool en);

	int (*send_smc_msg_with_param)(struct smu_context *smu,

				       enum smu_message_type msg, uint32_t param, uint32_t *read_arg);

	int (*send_smc_msg)(struct smu_context *smu,

			    enum smu_message_type msg,

			    uint32_t *read_arg);

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

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

	int (*get_enabled_mask)(struct smu_context *smu, uint32_t *feature_mask, uint32_t num);
@@ -763,7 +766,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);

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

int smu_force_clk_levels(struct smu_context *smu,

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

+0 −6
Original line number Diff line number Diff line
@@ -165,12 +165,6 @@ int smu_v11_0_notify_memory_pool_location(struct smu_context *smu); 
int smu_v11_0_system_features_control(struct smu_context *smu,

					     bool en);



int

smu_v11_0_send_msg_with_param(struct smu_context *smu,

			      enum smu_message_type msg,

			      uint32_t param,

			      uint32_t *read_arg);



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



int smu_v11_0_set_allowed_mask(struct smu_context *smu);

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

+0 −11
Original line number Diff line number Diff line
@@ -31,17 +31,6 @@ 
#define MP1_Public			0x03b00000

#define MP1_SRAM			0x03c00004



int smu_v12_0_send_msg_without_waiting(struct smu_context *smu,

					      uint16_t msg);



int smu_v12_0_wait_for_response(struct smu_context *smu);



int

smu_v12_0_send_msg_with_param(struct smu_context *smu,

			      enum smu_message_type msg,

			      uint32_t param,

			      uint32_t *read_arg);



int smu_v12_0_check_fw_status(struct smu_context *smu);



int smu_v12_0_check_fw_version(struct smu_context *smu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE