Commit 76d8f83b authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu/powerplay: unify smu send message function 



Drop smu_send_smc_msg function from ASIC specify structure.
Reuse smu_send_smc_msg_with_param function for smu_send_smc_msg.
Set paramer to 0 for smu_send_msg function, otherwise it will send
with previous paramer value (Not a certain value).
Materialize msg type for smu send message function definition.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 627f75d1

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

+9 −0
Original line number Diff line number Diff line
@@ -2548,3 +2548,12 @@ uint32_t smu_get_pptable_power_limit(struct smu_context *smu) 


	return ret;

}



int smu_send_smc_msg(struct smu_context *smu,

		     enum smu_message_type msg)

{

	int ret;



	ret = smu_send_smc_msg_with_param(smu, msg, 0);

	return ret;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -2130,7 +2130,6 @@ 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 = smu_v11_0_send_msg,

	.send_smc_msg_with_param = smu_v11_0_send_msg_with_param,

	.read_smc_arg = smu_v11_0_read_arg,

	.init_display_count = smu_v11_0_init_display_count,

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

+2 −2
Original line number Diff line number Diff line
@@ -497,8 +497,8 @@ struct pptable_funcs { 
	int (*notify_memory_pool_location)(struct smu_context *smu);

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

	int (*system_features_control)(struct smu_context *smu, bool en);

	int (*send_smc_msg)(struct smu_context *smu, uint16_t msg);

	int (*send_smc_msg_with_param)(struct smu_context *smu, uint16_t msg, uint32_t param);

	int (*send_smc_msg_with_param)(struct smu_context *smu,

				       enum smu_message_type msg, uint32_t param);

	int (*read_smc_arg)(struct smu_context *smu, uint32_t *arg);

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

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

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

+2 −3
Original line number Diff line number Diff line
@@ -177,10 +177,9 @@ 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(struct smu_context *smu, uint16_t msg);



int

smu_v11_0_send_msg_with_param(struct smu_context *smu, uint16_t msg,

smu_v11_0_send_msg_with_param(struct smu_context *smu,

			      enum smu_message_type msg,

			      uint32_t param);



int smu_v11_0_read_arg(struct smu_context *smu, uint32_t *arg);

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

+2 −3
Original line number Diff line number Diff line
@@ -44,10 +44,9 @@ int smu_v12_0_read_arg(struct smu_context *smu, uint32_t *arg); 


int smu_v12_0_wait_for_response(struct smu_context *smu);



int smu_v12_0_send_msg(struct smu_context *smu, uint16_t msg);



int

smu_v12_0_send_msg_with_param(struct smu_context *smu, uint16_t msg,

smu_v12_0_send_msg_with_param(struct smu_context *smu,

			      enum smu_message_type msg,

			      uint32_t param);



int smu_v12_0_check_fw_status(struct smu_context *smu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE