Commit d1085d13 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Add pwait status to DMCUB diagnostics 



[Why]
To know if the firmware is idle when logging.

[How]
Add the pwait status to the DMCUB diagnostics.

Reviewed-by: default avatarOvidiu Bunea <ovidiu.bunea@amd.com>
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 79db4361

drivers/gpu/drm/amd/display/dmub/dmub_srv.h

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ struct dmub_diagnostic_data { 
	uint8_t is_traceport_en : 1;

	uint8_t is_cw0_enabled : 1;

	uint8_t is_cw6_enabled : 1;

	uint8_t is_pwait : 1;

};



struct dmub_srv_inbox {

drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c

+4 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ uint32_t dmub_dcn31_get_current_time(struct dmub_srv *dmub) 


void dmub_dcn31_get_diagnostic_data(struct dmub_srv *dmub)

{

	uint32_t is_dmub_enabled, is_soft_reset, is_sec_reset;

	uint32_t is_dmub_enabled, is_soft_reset, is_sec_reset, is_pwait;

	uint32_t is_traceport_enabled, is_cw0_enabled, is_cw6_enabled;

	struct dmub_timeout_info timeout = {0};
@@ -466,6 +466,9 @@ void dmub_dcn31_get_diagnostic_data(struct dmub_srv *dmub) 
	REG_GET(DMCUB_CNTL, DMCUB_ENABLE, &is_dmub_enabled);

	dmub->debug.is_dmcub_enabled = is_dmub_enabled;



	REG_GET(DMCUB_CNTL, DMCUB_PWAIT_MODE_STATUS, &is_pwait);

	dmub->debug.is_pwait = is_pwait;



	REG_GET(DMCUB_CNTL2, DMCUB_SOFT_RESET, &is_soft_reset);

	dmub->debug.is_dmcub_soft_reset = is_soft_reset;

drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c

+4 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ uint32_t dmub_dcn35_get_current_time(struct dmub_srv *dmub) 


void dmub_dcn35_get_diagnostic_data(struct dmub_srv *dmub)

{

	uint32_t is_dmub_enabled, is_soft_reset;

	uint32_t is_dmub_enabled, is_soft_reset, is_pwait;

	uint32_t is_traceport_enabled, is_cw6_enabled;

	struct dmub_timeout_info timeout = {0};
@@ -505,6 +505,9 @@ void dmub_dcn35_get_diagnostic_data(struct dmub_srv *dmub) 
	REG_GET(DMCUB_CNTL, DMCUB_ENABLE, &is_dmub_enabled);

	dmub->debug.is_dmcub_enabled = is_dmub_enabled;



	REG_GET(DMCUB_CNTL, DMCUB_PWAIT_MODE_STATUS, &is_pwait);

	dmub->debug.is_pwait = is_pwait;



	REG_GET(DMCUB_CNTL2, DMCUB_SOFT_RESET, &is_soft_reset);

	dmub->debug.is_dmcub_soft_reset = is_soft_reset;

drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c

+4 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ uint32_t dmub_dcn401_get_current_time(struct dmub_srv *dmub) 


void dmub_dcn401_get_diagnostic_data(struct dmub_srv *dmub)

{

	uint32_t is_dmub_enabled, is_soft_reset, is_sec_reset;

	uint32_t is_dmub_enabled, is_soft_reset, is_sec_reset, is_pwait;

	uint32_t is_traceport_enabled, is_cw0_enabled, is_cw6_enabled;

	struct dmub_timeout_info timeout = {0};
@@ -464,6 +464,9 @@ void dmub_dcn401_get_diagnostic_data(struct dmub_srv *dmub) 
	REG_GET(DMCUB_CNTL, DMCUB_ENABLE, &is_dmub_enabled);

	dmub->debug.is_dmcub_enabled = is_dmub_enabled;



	REG_GET(DMCUB_CNTL, DMCUB_PWAIT_MODE_STATUS, &is_pwait);

	dmub->debug.is_pwait = is_pwait;



	REG_GET(DMCUB_CNTL2, DMCUB_SOFT_RESET, &is_soft_reset);

	dmub->debug.is_dmcub_soft_reset = is_soft_reset;