drm/amd/display: Add diags scaling log by default

Print scaling parameters as they are calculated in diags.

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Eric Bernstein <Eric.Bernstein@amd.com>
Acked-by: Eryk Brol <eryk.brol@amd.com>
Acked-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/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 1000dc6daf722322af17215c42659f803d77180d..7b5f90ebb133bbd170827cd6d974005e2770b80c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1162,19 +1162,32 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
                /* May need to re-check lb size after this in some obscure scenario */
                calculate_inits_and_adj_vp(pipe_ctx);
 
-       DC_LOG_SCALER(
-                               "%s: Viewport:\nheight:%d width:%d x:%d "
-                               "y:%d\n dst_rect:\nheight:%d width:%d x:%d "
-                               "y:%d\n",
-                               __func__,
-                               pipe_ctx->plane_res.scl_data.viewport.height,
-                               pipe_ctx->plane_res.scl_data.viewport.width,
-                               pipe_ctx->plane_res.scl_data.viewport.x,
-                               pipe_ctx->plane_res.scl_data.viewport.y,
-                               plane_state->dst_rect.height,
-                               plane_state->dst_rect.width,
-                               plane_state->dst_rect.x,
-                               plane_state->dst_rect.y);
+       DC_LOG_SCALER("%s pipe %d:\nViewport: height:%d width:%d x:%d y:%d  Recout: height:%d width:%d x:%d y:%d  HACTIVE:%d VACTIVE:%d\n"
+                       "src_rect: height:%d width:%d x:%d y:%d  dst_rect: height:%d width:%d x:%d y:%d  clip_rect: height:%d width:%d x:%d y:%d\n",
+                       __func__,
+                       pipe_ctx->pipe_idx,
+                       pipe_ctx->plane_res.scl_data.viewport.height,
+                       pipe_ctx->plane_res.scl_data.viewport.width,
+                       pipe_ctx->plane_res.scl_data.viewport.x,
+                       pipe_ctx->plane_res.scl_data.viewport.y,
+                       pipe_ctx->plane_res.scl_data.recout.height,
+                       pipe_ctx->plane_res.scl_data.recout.width,
+                       pipe_ctx->plane_res.scl_data.recout.x,
+                       pipe_ctx->plane_res.scl_data.recout.y,
+                       pipe_ctx->plane_res.scl_data.h_active,
+                       pipe_ctx->plane_res.scl_data.v_active,
+                       plane_state->src_rect.height,
+                       plane_state->src_rect.width,
+                       plane_state->src_rect.x,
+                       plane_state->src_rect.y,
+                       plane_state->dst_rect.height,
+                       plane_state->dst_rect.width,
+                       plane_state->dst_rect.x,
+                       plane_state->dst_rect.y,
+                       plane_state->clip_rect.height,
+                       plane_state->clip_rect.width,
+                       plane_state->clip_rect.x,
+                       plane_state->clip_rect.y);
 
        if (store_h_border_left)
                restore_border_left_from_dst(pipe_ctx, store_h_border_left);

diff --git a/drivers/gpu/drm/amd/display/include/logger_types.h b/drivers/gpu/drm/amd/display/include/logger_types.h
index d66f9d8eefb4946d0aff846e1b09b5d6a7a3378b..5dea27fc5198ce6675268a3c708dbf2d4316172a 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/logger_types.h
+++ b/drivers/gpu/drm/amd/display/include/logger_types.h
@@ -147,11 +147,11 @@ enum dc_log_type {
                (1ULL << LOG_I2C_AUX) | \
                (1ULL << LOG_IF_TRACE) | \
                (1ULL << LOG_HDMI_FRL) | \
+               (1ULL << LOG_SCALER) | \
                (1ULL << LOG_DTN) /* | \
                (1ULL << LOG_DEBUG) | \
                (1ULL << LOG_BIOS) | \
                (1ULL << LOG_SURFACE) | \
-               (1ULL << LOG_SCALER) | \
                (1ULL << LOG_DML) | \
                (1ULL << LOG_HW_LINK_TRAINING) | \
                (1ULL << LOG_HW_AUDIO)| \