drm/amd/display: decouple color state from hw state log

Prepare to hook up color state log according to the DCN version.

v3:
- put functions in single line (Siqueira)

Signed-off-by: Melissa Wen <mwen@igalia.com>
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
index 6dd479e8a348502c9b285a38f16650fb7cb4f95e..388cc75d36ba084ba76b644045112fe87542e2dd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
@@ -283,19 +283,13 @@ static void dcn10_log_hubp_states(struct dc *dc, void *log_ctx)
        DTN_INFO("\n");
 }
 
-void dcn10_log_hw_state(struct dc *dc,
-       struct dc_log_buffer_ctx *log_ctx)
+static void dcn10_log_color_state(struct dc *dc,
+                                 struct dc_log_buffer_ctx *log_ctx)
 {
        struct dc_context *dc_ctx = dc->ctx;
        struct resource_pool *pool = dc->res_pool;
        int i;
 
-       DTN_INFO_BEGIN();
-
-       dcn10_log_hubbub_state(dc, log_ctx);
-
-       dcn10_log_hubp_states(dc, log_ctx);
-
        DTN_INFO("DPP:    IGAM format  IGAM mode    DGAM mode    RGAM mode"
                        "  GAMUT mode  C11 C12   C13 C14   C21 C22   C23 C24   "
                        "C31 C32   C33 C34\n");
@@ -352,6 +346,22 @@ void dcn10_log_hw_state(struct dc *dc,
                                s.idle);
        }
        DTN_INFO("\n");
+}
+
+void dcn10_log_hw_state(struct dc *dc,
+                       struct dc_log_buffer_ctx *log_ctx)
+{
+       struct dc_context *dc_ctx = dc->ctx;
+       struct resource_pool *pool = dc->res_pool;
+       int i;
+
+       DTN_INFO_BEGIN();
+
+       dcn10_log_hubbub_state(dc, log_ctx);
+
+       dcn10_log_hubp_states(dc, log_ctx);
+
+       dcn10_log_color_state(dc, log_ctx);
 
        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 blank_en\n");