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: Aric Cyr <Aric.Cyr@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Sung Lee <sunglee@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
index 0b17c2993ca5b5b3fd2187f150a29a6d86b89540..09784222cc0336ae87c5b3387f3155c2c2abee75 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
@@ -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 {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
index 0ddd310cc971070f8a3c1c76c3249d98d10798ab..6eebcb22e31739916a77ef9024da1f6ded89dcd7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
@@ -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 = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c
index e46bbe7ddcc910d5b8f562bce1669667b8a2b75a..2861d974fcf62a0465ab6a39a6e65c249888ec27 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c
@@ -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(

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
index aa80b3f2ca3f8b1c5463a45b3f0986efa368d78e..aaa29361384672d3886005c67f96c7aba5aa39f7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
@@ -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 {