From: Jordan Lazare <Jordan.Lazare@xxxxxxx> Change-Id: I499099f788838c17c243d471887a9c56c1747105 Signed-off-by: Jordan Lazare <Jordan.Lazare at amd.com> Acked-by: Harry Wentland <Harry.Wentland at amd.com> Reviewed-by: Charlene Liu <Charlene.Liu at amd.com> --- drivers/gpu/drm/amd/display/dc/basics/logger.c | 4 +++- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 4 ++-- drivers/gpu/drm/amd/display/include/logger_types.h | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/basics/logger.c b/drivers/gpu/drm/amd/display/dc/basics/logger.c index a5625a3badab..8f4497332bda 100644 --- a/drivers/gpu/drm/amd/display/dc/basics/logger.c +++ b/drivers/gpu/drm/amd/display/dc/basics/logger.c @@ -32,6 +32,7 @@ static const struct dc_log_type_info log_type_info_tbl[] = { {LOG_ERROR, "Error"}, {LOG_WARNING, "Warning"}, + {LOG_DEBUG, "Debug"}, {LOG_DC, "DC_Interface"}, {LOG_SURFACE, "Surface"}, {LOG_HW_HOTPLUG, "HW_Hotplug"}, @@ -80,12 +81,13 @@ static const struct dc_log_type_info log_type_info_tbl[] = { (1 << LOG_SYNC) | \ (1 << LOG_BANDWIDTH_VALIDATION) | \ (1 << LOG_MST) | \ - (1 << LOG_BIOS) | \ (1 << LOG_DETECTION_EDID_PARSER) | \ (1 << LOG_DETECTION_DP_CAPS) | \ (1 << LOG_BACKLIGHT)) | \ (1 << LOG_I2C_AUX) | \ (1 << LOG_IF_TRACE) /* | \ + (1 << LOG_DEBUG) | \ + (1 << LOG_BIOS) | \ (1 << LOG_SURFACE) | \ (1 << LOG_SCALER) | \ (1 << LOG_DML) | \ diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c index 656c39ac0256..50163a06a653 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c @@ -3299,7 +3299,7 @@ static enum bp_result patch_bios_image_from_ext_display_connection_info( opm_object, &ext_display_connection_info_tbl) != BP_RESULT_OK) { - dm_logger_write(bp->base.ctx->logger, LOG_BIOS, + dm_logger_write(bp->base.ctx->logger, LOG_WARNING, "%s: Failed to read Connection Info Table", __func__); return BP_RESULT_UNSUPPORTED; } diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c index 7f52e39ec92a..b94c1e5d85cb 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c @@ -773,8 +773,8 @@ void dce_aud_wall_dto_setup( crtc_info->calculated_pixel_clock, &clock_info); - dm_logger_write(audio->ctx->logger, LOG_HW_SET_MODE,\ - "\n************************%s:Input::requested_pixel_clock = %d"\ + dm_logger_write(audio->ctx->logger, LOG_HW_AUDIO,\ + "\n%s:Input::requested_pixel_clock = %d"\ "calculated_pixel_clock =%d\n"\ "audio_dto_module = %d audio_dto_phase =%d \n\n", __func__,\ crtc_info->requested_pixel_clock,\ diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c index d6662fa2f4e1..f3e1a293351f 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c @@ -1093,8 +1093,8 @@ static void dce110_se_setup_hdmi_audio( crtc_info->requested_pixel_clock, crtc_info->calculated_pixel_clock, &audio_clock_info)) { - dm_logger_write(enc->ctx->logger, LOG_HW_SET_MODE, - "\n*********************%s:Input::requested_pixel_clock = %d"\ + dm_logger_write(enc->ctx->logger, LOG_HW_AUDIO, + "\n%s:Input::requested_pixel_clock = %d"\ "calculated_pixel_clock = %d \n", __func__,\ crtc_info->requested_pixel_clock,\ crtc_info->calculated_pixel_clock); diff --git a/drivers/gpu/drm/amd/display/include/logger_types.h b/drivers/gpu/drm/amd/display/include/logger_types.h index babd6523b105..832d17e1cc49 100644 --- a/drivers/gpu/drm/amd/display/include/logger_types.h +++ b/drivers/gpu/drm/amd/display/include/logger_types.h @@ -35,6 +35,7 @@ struct dal_logger; enum dc_log_type { LOG_ERROR = 0, LOG_WARNING, + LOG_DEBUG, LOG_DC, LOG_SURFACE, LOG_HW_HOTPLUG, -- 2.10.2