Commit 738b3469 authored by Sung Lee's avatar Sung Lee Committed by Alex Deucher
Browse files

drm/amd/display: Add additional pstate registers to HW state query 



[WHY]
These registers would be useful to know when debugging pstate issues.

[HOW]
Add additional registers to hw state query.

Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarSung Lee <sunglee@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1ffbc89c

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h

+2 −0
Original line number Diff line number Diff line
@@ -690,6 +690,8 @@ struct dcn_hubp_state { 
	uint32_t primary_surface_addr_hi;

	uint32_t primary_meta_addr_lo;

	uint32_t primary_meta_addr_hi;

	uint32_t uclk_pstate_force;

	uint32_t hubp_cntl;

};



struct dcn10_hubp {

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c

+6 −0
Original line number Diff line number Diff line
@@ -628,6 +628,12 @@ void hubbub2_read_state(struct hubbub *hubbub, struct dcn_hubbub_state *hubbub_s 
		REG_WRITE(DCHUBBUB_TEST_DEBUG_INDEX, 0x6);

		hubbub_state->test_debug_data = REG_READ(DCHUBBUB_TEST_DEBUG_DATA);

	}



	if (REG(DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL))

		hubbub_state->watermark_change_cntl = REG_READ(DCHUBBUB_ARB_WATERMARK_CHANGE_CNTL);



	if (REG(DCHUBBUB_ARB_DRAM_STATE_CNTL))

		hubbub_state->dram_state_cntl = REG_READ(DCHUBBUB_ARB_DRAM_STATE_CNTL);

}



static const struct hubbub_funcs hubbub2_funcs = {

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c

+6 −0
Original line number Diff line number Diff line
@@ -449,6 +449,12 @@ void hubp3_read_state(struct hubp *hubp) 
		SWATH_HEIGHT_C, &rq_regs->rq_regs_c.swath_height,

		PTE_ROW_HEIGHT_LINEAR_C, &rq_regs->rq_regs_c.pte_row_height_linear);



	if (REG(UCLK_PSTATE_FORCE))

		s->uclk_pstate_force = REG_READ(UCLK_PSTATE_FORCE);



	if (REG(DCHUBP_CNTL))

		s->hubp_cntl = REG_READ(DCHUBP_CNTL);



}



void hubp3_setup(

drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ struct dcn_hubbub_state { 
	uint32_t vm_error_pipe;

	uint32_t vm_error_mode;

	uint32_t test_debug_data;

	uint32_t watermark_change_cntl;

	uint32_t dram_state_cntl;

};



struct hubbub_funcs {