Commit beb9764a authored by George Shen's avatar George Shen Committed by Alex Deucher
Browse files

drm/amd/display: Add dummy interface for tracing DCN32 SMU messages 



[Why/How]
Some issues may require a trace of the previous SMU messages from DC to
understand the context and aid in debugging. Actual logging to be
implemented when needed.

Reviewed-by: default avatarJosip Pavic <josip.pavic@amd.com>
Acked-by: default avatarRoman Li <roman.li@amd.com>
Signed-off-by: default avatarGeorge Shen <george.shen@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 14f9db42

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c

+8 −0
Original line number Diff line number Diff line
@@ -52,4 +52,12 @@ void dm_perf_trace_timestamp(const char *func_name, unsigned int line, struct dc 
				    func_name, line);

}



void dm_trace_smu_msg(uint32_t msg_id, uint32_t param_in, struct dc_context *ctx)

{

}



void dm_trace_smu_delay(uint32_t delay, struct dc_context *ctx)

{

}



/**** power component interfaces ****/

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c

+4 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
 */

static uint32_t dcn30_smu_wait_for_response(struct clk_mgr_internal *clk_mgr, unsigned int delay_us, unsigned int max_retries)

{

	const uint32_t initial_max_retries = max_retries;

	uint32_t reg = 0;



	do {
@@ -69,7 +70,7 @@ static uint32_t dcn30_smu_wait_for_response(struct clk_mgr_internal *clk_mgr, un 


	/* handle DALSMC_Result_CmdRejectedBusy? */



	/* Log? */

	TRACE_SMU_DELAY(delay_us * (initial_max_retries - max_retries), clk_mgr->base.ctx);



	return reg;

}
@@ -89,6 +90,8 @@ static bool dcn30_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, uint 
	/* Trigger the message transaction by writing the message ID */

	REG_WRITE(DAL_MSG_REG, msg_id);



	TRACE_SMU_MSG(msg_id, param_in, clk_mgr->base.ctx);



	result = dcn30_smu_wait_for_response(clk_mgr, 10, 200000);



	if (IS_SMU_TIMEOUT(result)) {

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c

+9 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
 */

static uint32_t dcn32_smu_wait_for_response(struct clk_mgr_internal *clk_mgr, unsigned int delay_us, unsigned int max_retries)

{

	const uint32_t initial_max_retries = max_retries;

	uint32_t reg = 0;



	do {
@@ -62,6 +63,8 @@ static uint32_t dcn32_smu_wait_for_response(struct clk_mgr_internal *clk_mgr, un 
			udelay(delay_us);

	} while (max_retries--);



	TRACE_SMU_DELAY(delay_us * (initial_max_retries - max_retries), clk_mgr->base.ctx);



	return reg;

}
@@ -79,6 +82,8 @@ static bool dcn32_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, uint 
	/* Trigger the message transaction by writing the message ID */

	REG_WRITE(DAL_MSG_REG, msg_id);



	TRACE_SMU_MSG(msg_id, param_in, clk_mgr->base.ctx);



	/* Wait for response */

	if (dcn32_smu_wait_for_response(clk_mgr, 10, 200000) == DALSMC_Result_OK) {

		if (param_out)
@@ -115,6 +120,8 @@ static uint32_t dcn32_smu_wait_for_response_delay(struct clk_mgr_internal *clk_m 
		*total_delay_us += delay_us;

	} while (max_retries--);



	TRACE_SMU_DELAY(*total_delay_us, clk_mgr->base.ctx);



	return reg;

}
@@ -135,6 +142,8 @@ static bool dcn32_smu_send_msg_with_param_delay(struct clk_mgr_internal *clk_mgr 
	/* Trigger the message transaction by writing the message ID */

	REG_WRITE(DAL_MSG_REG, msg_id);



	TRACE_SMU_MSG(msg_id, param_in, clk_mgr->base.ctx);



	/* Wait for response */

	if (dcn32_smu_wait_for_response_delay(clk_mgr, 10, 200000, &delay2_us) == DALSMC_Result_OK) {

		if (param_out)

drivers/gpu/drm/amd/display/dc/dm_services.h

+10 −0
Original line number Diff line number Diff line
@@ -274,6 +274,16 @@ void dm_perf_trace_timestamp(const char *func_name, unsigned int line, struct dc 
#define PERF_TRACE()	dm_perf_trace_timestamp(__func__, __LINE__, CTX)

#define PERF_TRACE_CTX(__CTX)	dm_perf_trace_timestamp(__func__, __LINE__, __CTX)



/*

 * SMU message tracing

 */

void dm_trace_smu_msg(uint32_t msg_id, uint32_t param_in, struct dc_context *ctx);

void dm_trace_smu_delay(uint32_t delay, struct dc_context *ctx);



#define TRACE_SMU_MSG(msg_id, param_in, ctx)	dm_trace_smu_msg(msg_id, param_in, ctx)

#define TRACE_SMU_DELAY(response_delay, ctx)	dm_trace_smu_delay(response_delay, ctx)





/*

 * DMUB Interfaces

 */