drm/amd/display: Add vmax/min_sel prints to dcn10_log_hw_state

Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index de5293dc4db3f7752382a79354a44d58888b2c89..f3341a2399faf346bd4b1b473c694c2fa815cd31 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -165,7 +165,7 @@ void dcn10_log_hw_state(struct dc *dc)
        }
        DTN_INFO("\n");
 
-       DTN_INFO("OTG:  v_bs  v_be  v_ss  v_se  vpol  vmax  vmin"
+       DTN_INFO("OTG:  v_bs  v_be  v_ss  v_se  vpol  vmax  vmin  vmax_sel  vmin_sel"
                        "  h_bs  h_be  h_ss  h_se  hpol  htot  vtot  underflow\n");
 
        for (i = 0; i < pool->timing_generator_count; i++) {
@@ -178,7 +178,7 @@ void dcn10_log_hw_state(struct dc *dc)
                if ((s.otg_enabled & 1) == 0)
                        continue;
 
-               DTN_INFO("[%d]: %5d %5d %5d %5d %5d %5d %5d %5d %5d %5d"
+               DTN_INFO("[%d]: %5d %5d %5d %5d %5d %5d %5d %9d %9d %5d %5d %5d"
                                " %5d %5d %5d %5d  %9d\n",
                                tg->inst,
                                s.v_blank_start,
@@ -188,6 +188,8 @@ void dcn10_log_hw_state(struct dc *dc)
                                s.v_sync_a_pol,
                                s.v_total_max,
                                s.v_total_min,
+                               s.v_total_max_sel,
+                               s.v_total_min_sel,
                                s.h_blank_start,
                                s.h_blank_end,
                                s.h_sync_a_start,

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
index dc921307874aac614ddaf51e511abf8a69dbf933..2c5dbece928e754ce81b68ae6aaa3204c418590c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
@@ -1229,6 +1229,12 @@ void optc1_read_otg_state(struct optc *optc1,
        REG_GET(OTG_V_TOTAL_MIN,
                        OTG_V_TOTAL_MIN, &s->v_total_min);
 
+       REG_GET(OTG_V_TOTAL_CONTROL,
+                       OTG_V_TOTAL_MAX_SEL, &s->v_total_max_sel);
+
+       REG_GET(OTG_V_TOTAL_CONTROL,
+                       OTG_V_TOTAL_MIN_SEL, &s->v_total_min_sel);
+
        REG_GET_2(OTG_V_SYNC_A,
                        OTG_V_SYNC_A_START, &s->v_sync_a_start,
                        OTG_V_SYNC_A_END, &s->v_sync_a_end);

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h
index 5a9a73d69fd6448be3800aa76d64067f641cadac..89e09e5327a255d9d6c101fa7604ba5fe008412f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h
@@ -406,6 +406,8 @@ struct dcn_otg_state {
        uint32_t v_total;
        uint32_t v_total_max;
        uint32_t v_total_min;
+       uint32_t v_total_min_sel;
+       uint32_t v_total_max_sel;
        uint32_t v_sync_a_start;
        uint32_t v_sync_a_end;
        uint32_t h_blank_start;