aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>2018-02-16 13:57:42 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-03-05 15:35:06 -0500
commit2f3fd67a8af25f5b4d549c3e9cc515dbf1839ffc (patch)
treecd4c7cf8133e11c3803bdfee6e89f9ac148a7b7a
parent44c6f2e59ee815711a966a82b7d19dbab2110f4a (diff)
drm/amd/display: Use MACROS instead of dm_logger
Created MACROS for all log levels. Also Replaced usage of dm_logger_write to the defined MACROS Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/bios/bios_parser.c2
-rw-r--r--drivers/gpu/drm/amd/display/dc/bios/command_table2.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c8
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c32
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c34
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_resource.c2
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_abm.c2
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_audio.c10
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c24
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c4
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c10
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_transform.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c12
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c16
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.c10
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c2
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c32
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c6
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c44
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c28
-rw-r--r--drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c4
-rw-r--r--drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c4
-rw-r--r--drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c8
-rw-r--r--drivers/gpu/drm/amd/display/dc/irq/irq_service.c8
-rw-r--r--drivers/gpu/drm/amd/display/include/logger_types.h33
28 files changed, 199 insertions, 166 deletions
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 69c59e050a96..52f524a55b57 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
@@ -3079,7 +3079,7 @@ static enum bp_result patch_bios_image_from_ext_display_connection_info(
3079 opm_object, 3079 opm_object,
3080 &ext_display_connection_info_tbl) != BP_RESULT_OK) { 3080 &ext_display_connection_info_tbl) != BP_RESULT_OK) {
3081 3081
3082 dm_logger_write(bp->base.ctx->logger, LOG_WARNING, 3082 DC_LOG_WARNING(bp->base.ctx->logger,
3083 "%s: Failed to read Connection Info Table", __func__); 3083 "%s: Failed to read Connection Info Table", __func__);
3084 return BP_RESULT_UNSUPPORTED; 3084 return BP_RESULT_UNSUPPORTED;
3085 } 3085 }
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table2.c b/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
index fea5e83736fd..03df7b7a2d80 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
@@ -239,7 +239,7 @@ static enum bp_result transmitter_control_v1_6(
239 if (cntl->action == TRANSMITTER_CONTROL_ENABLE || 239 if (cntl->action == TRANSMITTER_CONTROL_ENABLE ||
240 cntl->action == TRANSMITTER_CONTROL_ACTIAVATE || 240 cntl->action == TRANSMITTER_CONTROL_ACTIAVATE ||
241 cntl->action == TRANSMITTER_CONTROL_DEACTIVATE) { 241 cntl->action == TRANSMITTER_CONTROL_DEACTIVATE) {
242 dm_logger_write(bp->base.ctx->logger, LOG_BIOS,\ 242 DC_LOG_BIOS(bp->base.ctx->logger, \
243 "%s:ps.param.symclk_10khz = %d\n",\ 243 "%s:ps.param.symclk_10khz = %d\n",\
244 __func__, ps.param.symclk_10khz); 244 __func__, ps.param.symclk_10khz);
245 } 245 }
@@ -331,7 +331,7 @@ static enum bp_result set_pixel_clock_v7(
331 (uint8_t) bp->cmd_helper-> 331 (uint8_t) bp->cmd_helper->
332 transmitter_color_depth_to_atom( 332 transmitter_color_depth_to_atom(
333 bp_params->color_depth); 333 bp_params->color_depth);
334 dm_logger_write(bp->base.ctx->logger, LOG_BIOS,\ 334 DC_LOG_BIOS(bp->base.ctx->logger, \
335 "%s:program display clock = %d"\ 335 "%s:program display clock = %d"\
336 "colorDepth = %d\n", __func__,\ 336 "colorDepth = %d\n", __func__,\
337 bp_params->target_pixel_clock, bp_params->color_depth); 337 bp_params->target_pixel_clock, bp_params->color_depth);
@@ -772,7 +772,7 @@ static enum bp_result set_dce_clock_v2_1(
772 */ 772 */
773 params.param.dceclk_10khz = cpu_to_le32( 773 params.param.dceclk_10khz = cpu_to_le32(
774 bp_params->target_clock_frequency / 10); 774 bp_params->target_clock_frequency / 10);
775 dm_logger_write(bp->base.ctx->logger, LOG_BIOS, 775 DC_LOG_BIOS(bp->base.ctx->logger,
776 "%s:target_clock_frequency = %d"\ 776 "%s:target_clock_frequency = %d"\
777 "clock_type = %d \n", __func__,\ 777 "clock_type = %d \n", __func__,\
778 bp_params->target_clock_frequency,\ 778 bp_params->target_clock_frequency,\
diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
index e4d8a8dbc5ef..7728c85bcb0e 100644
--- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
@@ -1242,7 +1242,7 @@ unsigned int dcn_find_dcfclk_suits_all(
1242 else 1242 else
1243 dcf_clk = dc->dcn_soc->dcfclkv_min0p65*1000; 1243 dcf_clk = dc->dcn_soc->dcfclkv_min0p65*1000;
1244 1244
1245 dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS, 1245 DC_LOG_BANDWIDTH_CALCS(dc->ctx->logger,
1246 "\tdcf_clk for voltage = %d\n", dcf_clk); 1246 "\tdcf_clk for voltage = %d\n", dcf_clk);
1247 return dcf_clk; 1247 return dcf_clk;
1248} 1248}
@@ -1441,7 +1441,7 @@ void dcn_bw_notify_pplib_of_wm_ranges(struct dc *dc)
1441void dcn_bw_sync_calcs_and_dml(struct dc *dc) 1441void dcn_bw_sync_calcs_and_dml(struct dc *dc)
1442{ 1442{
1443 kernel_fpu_begin(); 1443 kernel_fpu_begin();
1444 dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS, 1444 DC_LOG_BANDWIDTH_CALCS(dc->ctx->logger,
1445 "sr_exit_time: %d ns\n" 1445 "sr_exit_time: %d ns\n"
1446 "sr_enter_plus_exit_time: %d ns\n" 1446 "sr_enter_plus_exit_time: %d ns\n"
1447 "urgent_latency: %d ns\n" 1447 "urgent_latency: %d ns\n"
@@ -1510,7 +1510,7 @@ void dcn_bw_sync_calcs_and_dml(struct dc *dc)
1510 dc->dcn_soc->vmm_page_size, 1510 dc->dcn_soc->vmm_page_size,
1511 dc->dcn_soc->dram_clock_change_latency * 1000, 1511 dc->dcn_soc->dram_clock_change_latency * 1000,
1512 dc->dcn_soc->return_bus_width); 1512 dc->dcn_soc->return_bus_width);
1513 dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS, 1513 DC_LOG_BANDWIDTH_CALCS(dc->ctx->logger,
1514 "rob_buffer_size_in_kbyte: %d\n" 1514 "rob_buffer_size_in_kbyte: %d\n"
1515 "det_buffer_size_in_kbyte: %d\n" 1515 "det_buffer_size_in_kbyte: %d\n"
1516 "dpp_output_buffer_pixels: %d\n" 1516 "dpp_output_buffer_pixels: %d\n"
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 77a1bf233c3c..73bb416cb7dc 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -264,7 +264,7 @@ bool dc_stream_configure_crc(struct dc *dc, struct dc_stream_state *stream,
264 /* Only call if supported */ 264 /* Only call if supported */
265 if (tg->funcs->configure_crc) 265 if (tg->funcs->configure_crc)
266 return tg->funcs->configure_crc(tg, &param); 266 return tg->funcs->configure_crc(tg, &param);
267 dm_logger_write(dc->ctx->logger, LOG_WARNING, "CRC capture not supported."); 267 DC_LOG_WARNING(dc->ctx->logger, "CRC capture not supported.");
268 return false; 268 return false;
269} 269}
270 270
@@ -297,7 +297,7 @@ bool dc_stream_get_crc(struct dc *dc, struct dc_stream_state *stream,
297 297
298 if (tg->funcs->get_crc) 298 if (tg->funcs->get_crc)
299 return tg->funcs->get_crc(tg, r_cr, g_y, b_cb); 299 return tg->funcs->get_crc(tg, r_cr, g_y, b_cb);
300 dm_logger_write(dc->ctx->logger, LOG_WARNING, "CRC capture not supported."); 300 DC_LOG_WARNING(dc->ctx->logger, "CRC capture not supported.");
301 return false; 301 return false;
302} 302}
303 303
@@ -618,7 +618,7 @@ struct dc *dc_create(const struct dc_init_data *init_params)
618 618
619 dc->config = init_params->flags; 619 dc->config = init_params->flags;
620 620
621 dm_logger_write(dc->ctx->logger, LOG_DC, 621 DC_LOG_DC(dc->ctx->logger,
622 "Display Core initialized\n"); 622 "Display Core initialized\n");
623 623
624 624
@@ -888,7 +888,7 @@ bool dc_commit_state(struct dc *dc, struct dc_state *context)
888 if (false == context_changed(dc, context)) 888 if (false == context_changed(dc, context))
889 return DC_OK; 889 return DC_OK;
890 890
891 dm_logger_write(dc->ctx->logger, LOG_DC, "%s: %d streams\n", 891 DC_LOG_DC(dc->ctx->logger, "%s: %d streams\n",
892 __func__, context->stream_count); 892 __func__, context->stream_count);
893 893
894 for (i = 0; i < context->stream_count; i++) { 894 for (i = 0; i < context->stream_count; i++) {
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index b7540152005b..059ceada2095 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -47,7 +47,7 @@
47#include "dce/dce_11_0_sh_mask.h" 47#include "dce/dce_11_0_sh_mask.h"
48 48
49#define LINK_INFO(...) \ 49#define LINK_INFO(...) \
50 dm_logger_write(dc_ctx->logger, LOG_HW_HOTPLUG, \ 50 DC_LOG_HW_HOTPLUG(dc_ctx->logger, \
51 __VA_ARGS__) 51 __VA_ARGS__)
52 52
53/******************************************************************************* 53/*******************************************************************************
@@ -677,11 +677,11 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
677 677
678 switch (edid_status) { 678 switch (edid_status) {
679 case EDID_BAD_CHECKSUM: 679 case EDID_BAD_CHECKSUM:
680 dm_logger_write(link->ctx->logger, LOG_ERROR, 680 DC_LOG_ERROR(link->ctx->logger,
681 "EDID checksum invalid.\n"); 681 "EDID checksum invalid.\n");
682 break; 682 break;
683 case EDID_NO_RESPONSE: 683 case EDID_NO_RESPONSE:
684 dm_logger_write(link->ctx->logger, LOG_ERROR, 684 DC_LOG_ERROR(link->ctx->logger,
685 "No EDID read.\n"); 685 "No EDID read.\n");
686 default: 686 default:
687 break; 687 break;
@@ -712,7 +712,7 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
712 "%s: [Block %d] ", sink->edid_caps.display_name, i); 712 "%s: [Block %d] ", sink->edid_caps.display_name, i);
713 } 713 }
714 714
715 dm_logger_write(link->ctx->logger, LOG_DETECTION_EDID_PARSER, 715 DC_LOG_DETECTION_EDID_PARSER(link->ctx->logger,
716 "%s: " 716 "%s: "
717 "manufacturer_id = %X, " 717 "manufacturer_id = %X, "
718 "product_id = %X, " 718 "product_id = %X, "
@@ -733,7 +733,7 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
733 sink->edid_caps.audio_mode_count); 733 sink->edid_caps.audio_mode_count);
734 734
735 for (i = 0; i < sink->edid_caps.audio_mode_count; i++) { 735 for (i = 0; i < sink->edid_caps.audio_mode_count; i++) {
736 dm_logger_write(link->ctx->logger, LOG_DETECTION_EDID_PARSER, 736 DC_LOG_DETECTION_EDID_PARSER(link->ctx->logger,
737 "%s: mode number = %d, " 737 "%s: mode number = %d, "
738 "format_code = %d, " 738 "format_code = %d, "
739 "channel_count = %d, " 739 "channel_count = %d, "
@@ -984,7 +984,7 @@ static bool construct(
984 } 984 }
985 break; 985 break;
986 default: 986 default:
987 dm_logger_write(dc_ctx->logger, LOG_WARNING, 987 DC_LOG_WARNING(dc_ctx->logger,
988 "Unsupported Connector type:%d!\n", link->link_id.id); 988 "Unsupported Connector type:%d!\n", link->link_id.id);
989 goto create_fail; 989 goto create_fail;
990 } 990 }
@@ -1175,7 +1175,7 @@ static void dpcd_configure_panel_mode(
1175 ASSERT(result == DDC_RESULT_SUCESSFULL); 1175 ASSERT(result == DDC_RESULT_SUCESSFULL);
1176 } 1176 }
1177 } 1177 }
1178 dm_logger_write(link->ctx->logger, LOG_DETECTION_DP_CAPS, 1178 DC_LOG_DETECTION_DP_CAPS(link->ctx->logger,
1179 "Link: %d eDP panel mode supported: %d " 1179 "Link: %d eDP panel mode supported: %d "
1180 "eDP panel mode enabled: %d \n", 1180 "eDP panel mode enabled: %d \n",
1181 link->link_index, 1181 link->link_index,
@@ -1965,7 +1965,7 @@ bool dc_link_set_backlight_level(const struct dc_link *link, uint32_t level,
1965 1965
1966 use_smooth_brightness = dmcu->funcs->is_dmcu_initialized(dmcu); 1966 use_smooth_brightness = dmcu->funcs->is_dmcu_initialized(dmcu);
1967 1967
1968 dm_logger_write(link->ctx->logger, LOG_BACKLIGHT, 1968 DC_LOG_BACKLIGHT(link->ctx->logger,
1969 "New Backlight level: %d (0x%X)\n", level, level); 1969 "New Backlight level: %d (0x%X)\n", level, level);
1970 1970
1971 if (dc_is_embedded_signal(link->connector_signal)) { 1971 if (dc_is_embedded_signal(link->connector_signal)) {
@@ -2150,20 +2150,20 @@ static enum dc_status allocate_mst_payload(struct pipe_ctx *pipe_ctx)
2150 link, pipe_ctx->stream_res.stream_enc, &proposed_table); 2150 link, pipe_ctx->stream_res.stream_enc, &proposed_table);
2151 } 2151 }
2152 else 2152 else
2153 dm_logger_write(link->ctx->logger, LOG_WARNING, 2153 DC_LOG_WARNING(link->ctx->logger,
2154 "Failed to update" 2154 "Failed to update"
2155 "MST allocation table for" 2155 "MST allocation table for"
2156 "pipe idx:%d\n", 2156 "pipe idx:%d\n",
2157 pipe_ctx->pipe_idx); 2157 pipe_ctx->pipe_idx);
2158 2158
2159 dm_logger_write(link->ctx->logger, LOG_MST, 2159 DC_LOG_MST(link->ctx->logger,
2160 "%s " 2160 "%s "
2161 "stream_count: %d: \n ", 2161 "stream_count: %d: \n ",
2162 __func__, 2162 __func__,
2163 link->mst_stream_alloc_table.stream_count); 2163 link->mst_stream_alloc_table.stream_count);
2164 2164
2165 for (i = 0; i < MAX_CONTROLLER_NUM; i++) { 2165 for (i = 0; i < MAX_CONTROLLER_NUM; i++) {
2166 dm_logger_write(link->ctx->logger, LOG_MST, 2166 DC_LOG_MST(link->ctx->logger,
2167 "stream_enc[%d]: 0x%x " 2167 "stream_enc[%d]: 0x%x "
2168 "stream[%d].vcp_id: %d " 2168 "stream[%d].vcp_id: %d "
2169 "stream[%d].slot_count: %d\n", 2169 "stream[%d].slot_count: %d\n",
@@ -2240,7 +2240,7 @@ static enum dc_status deallocate_mst_payload(struct pipe_ctx *pipe_ctx)
2240 link, pipe_ctx->stream_res.stream_enc, &proposed_table); 2240 link, pipe_ctx->stream_res.stream_enc, &proposed_table);
2241 } 2241 }
2242 else { 2242 else {
2243 dm_logger_write(link->ctx->logger, LOG_WARNING, 2243 DC_LOG_WARNING(link->ctx->logger,
2244 "Failed to update" 2244 "Failed to update"
2245 "MST allocation table for" 2245 "MST allocation table for"
2246 "pipe idx:%d\n", 2246 "pipe idx:%d\n",
@@ -2248,14 +2248,14 @@ static enum dc_status deallocate_mst_payload(struct pipe_ctx *pipe_ctx)
2248 } 2248 }
2249 } 2249 }
2250 2250
2251 dm_logger_write(link->ctx->logger, LOG_MST, 2251 DC_LOG_MST(link->ctx->logger,
2252 "%s" 2252 "%s"
2253 "stream_count: %d: ", 2253 "stream_count: %d: ",
2254 __func__, 2254 __func__,
2255 link->mst_stream_alloc_table.stream_count); 2255 link->mst_stream_alloc_table.stream_count);
2256 2256
2257 for (i = 0; i < MAX_CONTROLLER_NUM; i++) { 2257 for (i = 0; i < MAX_CONTROLLER_NUM; i++) {
2258 dm_logger_write(link->ctx->logger, LOG_MST, 2258 DC_LOG_MST(link->ctx->logger,
2259 "stream_enc[%d]: 0x%x " 2259 "stream_enc[%d]: 0x%x "
2260 "stream[%d].vcp_id: %d " 2260 "stream[%d].vcp_id: %d "
2261 "stream[%d].slot_count: %d\n", 2261 "stream[%d].slot_count: %d\n",
@@ -2307,8 +2307,8 @@ void core_link_enable_stream(
2307 status = enable_link(state, pipe_ctx); 2307 status = enable_link(state, pipe_ctx);
2308 2308
2309 if (status != DC_OK) { 2309 if (status != DC_OK) {
2310 dm_logger_write(pipe_ctx->stream->ctx->logger, 2310 DC_LOG_WARNING(pipe_ctx->stream->ctx->logger,
2311 LOG_WARNING, "enabling link %u failed: %d\n", 2311 "enabling link %u failed: %d\n",
2312 pipe_ctx->stream->sink->link->link_index, 2312 pipe_ctx->stream->sink->link->link_index,
2313 status); 2313 status);
2314 2314
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 4c21da54a9d5..9a041641a539 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -63,7 +63,7 @@ static void wait_for_training_aux_rd_interval(
63 63
64 udelay(default_wait_in_micro_secs); 64 udelay(default_wait_in_micro_secs);
65 65
66 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 66 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
67 "%s:\n wait = %d\n", 67 "%s:\n wait = %d\n",
68 __func__, 68 __func__,
69 default_wait_in_micro_secs); 69 default_wait_in_micro_secs);
@@ -79,7 +79,7 @@ static void dpcd_set_training_pattern(
79 &dpcd_pattern.raw, 79 &dpcd_pattern.raw,
80 1); 80 1);
81 81
82 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 82 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
83 "%s\n %x pattern = %x\n", 83 "%s\n %x pattern = %x\n",
84 __func__, 84 __func__,
85 DP_TRAINING_PATTERN_SET, 85 DP_TRAINING_PATTERN_SET,
@@ -116,7 +116,7 @@ static void dpcd_set_link_settings(
116 core_link_write_dpcd(link, DP_DOWNSPREAD_CTRL, 116 core_link_write_dpcd(link, DP_DOWNSPREAD_CTRL,
117 &downspread.raw, sizeof(downspread)); 117 &downspread.raw, sizeof(downspread));
118 118
119 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 119 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
120 "%s\n %x rate = %x\n %x lane = %x\n %x spread = %x\n", 120 "%s\n %x rate = %x\n %x lane = %x\n %x spread = %x\n",
121 __func__, 121 __func__,
122 DP_LINK_BW_SET, 122 DP_LINK_BW_SET,
@@ -151,7 +151,7 @@ static enum dpcd_training_patterns
151 break; 151 break;
152 default: 152 default:
153 ASSERT(0); 153 ASSERT(0);
154 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 154 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
155 "%s: Invalid HW Training pattern: %d\n", 155 "%s: Invalid HW Training pattern: %d\n",
156 __func__, pattern); 156 __func__, pattern);
157 break; 157 break;
@@ -184,7 +184,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
184 dpcd_lt_buffer[DP_TRAINING_PATTERN_SET - dpcd_base_lt_offset] 184 dpcd_lt_buffer[DP_TRAINING_PATTERN_SET - dpcd_base_lt_offset]
185 = dpcd_pattern.raw; 185 = dpcd_pattern.raw;
186 186
187 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 187 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
188 "%s\n %x pattern = %x\n", 188 "%s\n %x pattern = %x\n",
189 __func__, 189 __func__,
190 DP_TRAINING_PATTERN_SET, 190 DP_TRAINING_PATTERN_SET,
@@ -219,7 +219,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
219 dpcd_lane, 219 dpcd_lane,
220 size_in_bytes); 220 size_in_bytes);
221 221
222 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 222 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
223 "%s:\n %x VS set = %x PE set = %x max VS Reached = %x max PE Reached = %x\n", 223 "%s:\n %x VS set = %x PE set = %x max VS Reached = %x max PE Reached = %x\n",
224 __func__, 224 __func__,
225 DP_TRAINING_LANE0_SET, 225 DP_TRAINING_LANE0_SET,
@@ -456,13 +456,13 @@ static void get_lane_status_and_drive_settings(
456 456
457 ln_status_updated->raw = dpcd_buf[2]; 457 ln_status_updated->raw = dpcd_buf[2];
458 458
459 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 459 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
460 "%s:\n%x Lane01Status = %x\n %x Lane23Status = %x\n ", 460 "%s:\n%x Lane01Status = %x\n %x Lane23Status = %x\n ",
461 __func__, 461 __func__,
462 DP_LANE0_1_STATUS, dpcd_buf[0], 462 DP_LANE0_1_STATUS, dpcd_buf[0],
463 DP_LANE2_3_STATUS, dpcd_buf[1]); 463 DP_LANE2_3_STATUS, dpcd_buf[1]);
464 464
465 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 465 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
466 "%s:\n %x Lane01AdjustRequest = %x\n %x Lane23AdjustRequest = %x\n", 466 "%s:\n %x Lane01AdjustRequest = %x\n %x Lane23AdjustRequest = %x\n",
467 __func__, 467 __func__,
468 DP_ADJUST_REQUEST_LANE0_1, 468 DP_ADJUST_REQUEST_LANE0_1,
@@ -556,7 +556,7 @@ static void dpcd_set_lane_settings(
556 } 556 }
557 */ 557 */
558 558
559 dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING, 559 DC_LOG_HW_LINK_TRAINING(link->ctx->logger,
560 "%s\n %x VS set = %x PE set = %x max VS Reached = %x max PE Reached = %x\n", 560 "%s\n %x VS set = %x PE set = %x max VS Reached = %x max PE Reached = %x\n",
561 __func__, 561 __func__,
562 DP_TRAINING_LANE0_SET, 562 DP_TRAINING_LANE0_SET,
@@ -669,7 +669,7 @@ static bool perform_post_lt_adj_req_sequence(
669 } 669 }
670 670
671 if (!req_drv_setting_changed) { 671 if (!req_drv_setting_changed) {
672 dm_logger_write(link->ctx->logger, LOG_WARNING, 672 DC_LOG_WARNING(link->ctx->logger,
673 "%s: Post Link Training Adjust Request Timed out\n", 673 "%s: Post Link Training Adjust Request Timed out\n",
674 __func__); 674 __func__);
675 675
@@ -677,7 +677,7 @@ static bool perform_post_lt_adj_req_sequence(
677 return true; 677 return true;
678 } 678 }
679 } 679 }
680 dm_logger_write(link->ctx->logger, LOG_WARNING, 680 DC_LOG_WARNING(link->ctx->logger,
681 "%s: Post Link Training Adjust Request limit reached\n", 681 "%s: Post Link Training Adjust Request limit reached\n",
682 __func__); 682 __func__);
683 683
@@ -885,7 +885,7 @@ static enum link_training_result perform_clock_recovery_sequence(
885 885
886 if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) { 886 if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
887 ASSERT(0); 887 ASSERT(0);
888 dm_logger_write(link->ctx->logger, LOG_ERROR, 888 DC_LOG_ERROR(link->ctx->logger,
889 "%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue", 889 "%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
890 __func__, 890 __func__,
891 LINK_TRAINING_MAX_CR_RETRY); 891 LINK_TRAINING_MAX_CR_RETRY);
@@ -1606,7 +1606,7 @@ static bool hpd_rx_irq_check_link_loss_status(
1606 if (sink_status_changed || 1606 if (sink_status_changed ||
1607 !hpd_irq_dpcd_data->bytes.lane_status_updated.bits.INTERLANE_ALIGN_DONE) { 1607 !hpd_irq_dpcd_data->bytes.lane_status_updated.bits.INTERLANE_ALIGN_DONE) {
1608 1608
1609 dm_logger_write(link->ctx->logger, LOG_HW_HPD_IRQ, 1609 DC_LOG_HW_HPD_IRQ(link->ctx->logger,
1610 "%s: Link Status changed.\n", __func__); 1610 "%s: Link Status changed.\n", __func__);
1611 1611
1612 return_code = true; 1612 return_code = true;
@@ -1620,7 +1620,7 @@ static bool hpd_rx_irq_check_link_loss_status(
1620 sizeof(irq_reg_rx_power_state)); 1620 sizeof(irq_reg_rx_power_state));
1621 1621
1622 if (dpcd_result != DC_OK) { 1622 if (dpcd_result != DC_OK) {
1623 dm_logger_write(link->ctx->logger, LOG_HW_HPD_IRQ, 1623 DC_LOG_HW_HPD_IRQ(link->ctx->logger,
1624 "%s: DPCD read failed to obtain power state.\n", 1624 "%s: DPCD read failed to obtain power state.\n",
1625 __func__); 1625 __func__);
1626 } else { 1626 } else {
@@ -1982,7 +1982,7 @@ bool dc_link_handle_hpd_rx_irq(struct dc_link *link, union hpd_irq_data *out_hpd
1982 * PSR and device auto test, refer to function handle_sst_hpd_irq 1982 * PSR and device auto test, refer to function handle_sst_hpd_irq
1983 * in DAL2.1*/ 1983 * in DAL2.1*/
1984 1984
1985 dm_logger_write(link->ctx->logger, LOG_HW_HPD_IRQ, 1985 DC_LOG_HW_HPD_IRQ(link->ctx->logger,
1986 "%s: Got short pulse HPD on link %d\n", 1986 "%s: Got short pulse HPD on link %d\n",
1987 __func__, link->link_index); 1987 __func__, link->link_index);
1988 1988
@@ -1997,7 +1997,7 @@ bool dc_link_handle_hpd_rx_irq(struct dc_link *link, union hpd_irq_data *out_hpd
1997 *out_hpd_irq_dpcd_data = hpd_irq_dpcd_data; 1997 *out_hpd_irq_dpcd_data = hpd_irq_dpcd_data;
1998 1998
1999 if (result != DC_OK) { 1999 if (result != DC_OK) {
2000 dm_logger_write(link->ctx->logger, LOG_HW_HPD_IRQ, 2000 DC_LOG_HW_HPD_IRQ(link->ctx->logger,
2001 "%s: DPCD read failed to obtain irq data\n", 2001 "%s: DPCD read failed to obtain irq data\n",
2002 __func__); 2002 __func__);
2003 return false; 2003 return false;
@@ -2016,7 +2016,7 @@ bool dc_link_handle_hpd_rx_irq(struct dc_link *link, union hpd_irq_data *out_hpd
2016 } 2016 }
2017 2017
2018 if (!allow_hpd_rx_irq(link)) { 2018 if (!allow_hpd_rx_irq(link)) {
2019 dm_logger_write(link->ctx->logger, LOG_HW_HPD_IRQ, 2019 DC_LOG_HW_HPD_IRQ(link->ctx->logger,
2020 "%s: skipping HPD handling on %d\n", 2020 "%s: skipping HPD handling on %d\n",
2021 __func__, link->link_index); 2021 __func__, link->link_index);
2022 return false; 2022 return false;
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 48709d4b5627..52b0a4ae2f9a 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -893,7 +893,7 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
893 /* May need to re-check lb size after this in some obscure scenario */ 893 /* May need to re-check lb size after this in some obscure scenario */
894 calculate_inits_and_adj_vp(pipe_ctx, &recout_skip); 894 calculate_inits_and_adj_vp(pipe_ctx, &recout_skip);
895 895
896 dm_logger_write(pipe_ctx->stream->ctx->logger, LOG_SCALER, 896 DC_LOG_SCALER(pipe_ctx->stream->ctx->logger,
897 "%s: Viewport:\nheight:%d width:%d x:%d " 897 "%s: Viewport:\nheight:%d width:%d x:%d "
898 "y:%d\n dst_rect:\nheight:%d width:%d x:%d " 898 "y:%d\n dst_rect:\nheight:%d width:%d x:%d "
899 "y:%d\n", 899 "y:%d\n",
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
index b231bd53613e..5efd0c460bee 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
@@ -403,7 +403,7 @@ static bool dce_abm_set_backlight_level(
403{ 403{
404 struct dce_abm *abm_dce = TO_DCE_ABM(abm); 404 struct dce_abm *abm_dce = TO_DCE_ABM(abm);
405 405
406 dm_logger_write(abm->ctx->logger, LOG_BACKLIGHT, 406 DC_LOG_BACKLIGHT(abm->ctx->logger,
407 "New Backlight level: %d (0x%X)\n", 407 "New Backlight level: %d (0x%X)\n",
408 backlight_level, backlight_level); 408 backlight_level, backlight_level);
409 409
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 e366bfd7cf6f..2e86d8cb4ef3 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
@@ -63,7 +63,7 @@ static void write_indirect_azalia_reg(struct audio *audio,
63 REG_SET(AZALIA_F0_CODEC_ENDPOINT_DATA, 0, 63 REG_SET(AZALIA_F0_CODEC_ENDPOINT_DATA, 0,
64 AZALIA_ENDPOINT_REG_DATA, reg_data); 64 AZALIA_ENDPOINT_REG_DATA, reg_data);
65 65
66 dm_logger_write(CTX->logger, LOG_HW_AUDIO, 66 DC_LOG_HW_AUDIO(CTX->logger,
67 "AUDIO:write_indirect_azalia_reg: index: %u data: %u\n", 67 "AUDIO:write_indirect_azalia_reg: index: %u data: %u\n",
68 reg_index, reg_data); 68 reg_index, reg_data);
69} 69}
@@ -81,7 +81,7 @@ static uint32_t read_indirect_azalia_reg(struct audio *audio, uint32_t reg_index
81 /* AZALIA_F0_CODEC_ENDPOINT_DATA endpoint data */ 81 /* AZALIA_F0_CODEC_ENDPOINT_DATA endpoint data */
82 value = REG_READ(AZALIA_F0_CODEC_ENDPOINT_DATA); 82 value = REG_READ(AZALIA_F0_CODEC_ENDPOINT_DATA);
83 83
84 dm_logger_write(CTX->logger, LOG_HW_AUDIO, 84 DC_LOG_HW_AUDIO(CTX->logger,
85 "AUDIO:read_indirect_azalia_reg: index: %u data: %u\n", 85 "AUDIO:read_indirect_azalia_reg: index: %u data: %u\n",
86 reg_index, value); 86 reg_index, value);
87 87
@@ -364,7 +364,7 @@ void dce_aud_az_enable(struct audio *audio)
364 CLOCK_GATING_DISABLE); 364 CLOCK_GATING_DISABLE);
365 AZ_REG_WRITE(AZALIA_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL, value); 365 AZ_REG_WRITE(AZALIA_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL, value);
366 366
367 dm_logger_write(CTX->logger, LOG_HW_AUDIO, 367 DC_LOG_HW_AUDIO(CTX->logger,
368 "\n\t========= AUDIO:dce_aud_az_enable: index: %u data: 0x%x\n", 368 "\n\t========= AUDIO:dce_aud_az_enable: index: %u data: 0x%x\n",
369 audio->inst, value); 369 audio->inst, value);
370} 370}
@@ -390,7 +390,7 @@ void dce_aud_az_disable(struct audio *audio)
390 CLOCK_GATING_DISABLE); 390 CLOCK_GATING_DISABLE);
391 AZ_REG_WRITE(AZALIA_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL, value); 391 AZ_REG_WRITE(AZALIA_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL, value);
392 value = AZ_REG_READ(AZALIA_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL); 392 value = AZ_REG_READ(AZALIA_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL);
393 dm_logger_write(CTX->logger, LOG_HW_AUDIO, 393 DC_LOG_HW_AUDIO(CTX->logger,
394 "\n\t========= AUDIO:dce_aud_az_disable: index: %u data: 0x%x\n", 394 "\n\t========= AUDIO:dce_aud_az_disable: index: %u data: 0x%x\n",
395 audio->inst, value); 395 audio->inst, value);
396} 396}
@@ -795,7 +795,7 @@ void dce_aud_wall_dto_setup(
795 crtc_info->calculated_pixel_clock, 795 crtc_info->calculated_pixel_clock,
796 &clock_info); 796 &clock_info);
797 797
798 dm_logger_write(audio->ctx->logger, LOG_HW_AUDIO,\ 798 DC_LOG_HW_AUDIO(audio->ctx->logger, \
799 "\n%s:Input::requested_pixel_clock = %d"\ 799 "\n%s:Input::requested_pixel_clock = %d"\
800 "calculated_pixel_clock =%d\n"\ 800 "calculated_pixel_clock =%d\n"\
801 "audio_dto_module = %d audio_dto_phase =%d \n\n", __func__,\ 801 "audio_dto_module = %d audio_dto_phase =%d \n\n", __func__,\
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
index 5036b674f68b..2860d0a39be4 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
@@ -288,7 +288,7 @@ static uint32_t calculate_pixel_clock_pll_dividers(
288 uint32_t max_ref_divider; 288 uint32_t max_ref_divider;
289 289
290 if (pll_settings->adjusted_pix_clk == 0) { 290 if (pll_settings->adjusted_pix_clk == 0) {
291 dm_logger_write(calc_pll_cs->ctx->logger, LOG_ERROR, 291 DC_LOG_ERROR(calc_pll_cs->ctx->logger,
292 "%s Bad requested pixel clock", __func__); 292 "%s Bad requested pixel clock", __func__);
293 return MAX_PLL_CALC_ERROR; 293 return MAX_PLL_CALC_ERROR;
294 } 294 }
@@ -349,13 +349,13 @@ static uint32_t calculate_pixel_clock_pll_dividers(
349 * ## SVS Wed 15 Jul 2009 */ 349 * ## SVS Wed 15 Jul 2009 */
350 350
351 if (min_post_divider > max_post_divider) { 351 if (min_post_divider > max_post_divider) {
352 dm_logger_write(calc_pll_cs->ctx->logger, LOG_ERROR, 352 DC_LOG_ERROR(calc_pll_cs->ctx->logger,
353 "%s Post divider range is invalid", __func__); 353 "%s Post divider range is invalid", __func__);
354 return MAX_PLL_CALC_ERROR; 354 return MAX_PLL_CALC_ERROR;
355 } 355 }
356 356
357 if (min_ref_divider > max_ref_divider) { 357 if (min_ref_divider > max_ref_divider) {
358 dm_logger_write(calc_pll_cs->ctx->logger, LOG_ERROR, 358 DC_LOG_ERROR(calc_pll_cs->ctx->logger,
359 "%s Reference divider range is invalid", __func__); 359 "%s Reference divider range is invalid", __func__);
360 return MAX_PLL_CALC_ERROR; 360 return MAX_PLL_CALC_ERROR;
361 } 361 }
@@ -493,7 +493,7 @@ static uint32_t dce110_get_pix_clk_dividers_helper (
493 if (!pll_adjust_pix_clk(clk_src, pix_clk_params, pll_settings)) { 493 if (!pll_adjust_pix_clk(clk_src, pix_clk_params, pll_settings)) {
494 /* Should never happen, ASSERT and fill up values to be able 494 /* Should never happen, ASSERT and fill up values to be able
495 * to continue. */ 495 * to continue. */
496 dm_logger_write(clk_src->base.ctx->logger, LOG_ERROR, 496 DC_LOG_ERROR(clk_src->base.ctx->logger,
497 "%s: Failed to adjust pixel clock!!", __func__); 497 "%s: Failed to adjust pixel clock!!", __func__);
498 pll_settings->actual_pix_clk = 498 pll_settings->actual_pix_clk =
499 pix_clk_params->requested_pix_clk; 499 pix_clk_params->requested_pix_clk;
@@ -560,7 +560,7 @@ static uint32_t dce110_get_pix_clk_dividers(
560 560
561 if (pix_clk_params == NULL || pll_settings == NULL 561 if (pix_clk_params == NULL || pll_settings == NULL
562 || pix_clk_params->requested_pix_clk == 0) { 562 || pix_clk_params->requested_pix_clk == 0) {
563 dm_logger_write(clk_src->base.ctx->logger, LOG_ERROR, 563 DC_LOG_ERROR(clk_src->base.ctx->logger,
564 "%s: Invalid parameters!!\n", __func__); 564 "%s: Invalid parameters!!\n", __func__);
565 return pll_calc_error; 565 return pll_calc_error;
566 } 566 }
@@ -1054,12 +1054,12 @@ static void get_ss_info_from_atombios(
1054 uint32_t i; 1054 uint32_t i;
1055 1055
1056 if (ss_entries_num == NULL) { 1056 if (ss_entries_num == NULL) {
1057 dm_logger_write(clk_src->base.ctx->logger, LOG_SYNC, 1057 DC_LOG_SYNC(clk_src->base.ctx->logger,
1058 "Invalid entry !!!\n"); 1058 "Invalid entry !!!\n");
1059 return; 1059 return;
1060 } 1060 }
1061 if (spread_spectrum_data == NULL) { 1061 if (spread_spectrum_data == NULL) {
1062 dm_logger_write(clk_src->base.ctx->logger, LOG_SYNC, 1062 DC_LOG_SYNC(clk_src->base.ctx->logger,
1063 "Invalid array pointer!!!\n"); 1063 "Invalid array pointer!!!\n");
1064 return; 1064 return;
1065 } 1065 }
@@ -1104,7 +1104,7 @@ static void get_ss_info_from_atombios(
1104 ++i, ++ss_info_cur, ++ss_data_cur) { 1104 ++i, ++ss_info_cur, ++ss_data_cur) {
1105 1105
1106 if (ss_info_cur->type.STEP_AND_DELAY_INFO != false) { 1106 if (ss_info_cur->type.STEP_AND_DELAY_INFO != false) {
1107 dm_logger_write(clk_src->base.ctx->logger, LOG_SYNC, 1107 DC_LOG_SYNC(clk_src->base.ctx->logger,
1108 "Invalid ATOMBIOS SS Table!!!\n"); 1108 "Invalid ATOMBIOS SS Table!!!\n");
1109 goto out_free_data; 1109 goto out_free_data;
1110 } 1110 }
@@ -1114,9 +1114,9 @@ static void get_ss_info_from_atombios(
1114 if (as_signal == AS_SIGNAL_TYPE_HDMI 1114 if (as_signal == AS_SIGNAL_TYPE_HDMI
1115 && ss_info_cur->spread_spectrum_percentage > 6){ 1115 && ss_info_cur->spread_spectrum_percentage > 6){
1116 /* invalid input, do nothing */ 1116 /* invalid input, do nothing */
1117 dm_logger_write(clk_src->base.ctx->logger, LOG_SYNC, 1117 DC_LOG_SYNC(clk_src->base.ctx->logger,
1118 "Invalid SS percentage "); 1118 "Invalid SS percentage ");
1119 dm_logger_write(clk_src->base.ctx->logger, LOG_SYNC, 1119 DC_LOG_SYNC(clk_src->base.ctx->logger,
1120 "for HDMI in ATOMBIOS info Table!!!\n"); 1120 "for HDMI in ATOMBIOS info Table!!!\n");
1121 continue; 1121 continue;
1122 } 1122 }
@@ -1228,12 +1228,12 @@ static bool calc_pll_max_vco_construct(
1228 if (init_data->num_fract_fb_divider_decimal_point == 0 || 1228 if (init_data->num_fract_fb_divider_decimal_point == 0 ||
1229 init_data->num_fract_fb_divider_decimal_point_precision > 1229 init_data->num_fract_fb_divider_decimal_point_precision >
1230 init_data->num_fract_fb_divider_decimal_point) { 1230 init_data->num_fract_fb_divider_decimal_point) {
1231 dm_logger_write(calc_pll_cs->ctx->logger, LOG_ERROR, 1231 DC_LOG_ERROR(calc_pll_cs->ctx->logger,
1232 "The dec point num or precision is incorrect!"); 1232 "The dec point num or precision is incorrect!");
1233 return false; 1233 return false;
1234 } 1234 }
1235 if (init_data->num_fract_fb_divider_decimal_point_precision == 0) { 1235 if (init_data->num_fract_fb_divider_decimal_point_precision == 0) {
1236 dm_logger_write(calc_pll_cs->ctx->logger, LOG_ERROR, 1236 DC_LOG_ERROR(calc_pll_cs->ctx->logger,
1237 "Incorrect fract feedback divider precision num!"); 1237 "Incorrect fract feedback divider precision num!");
1238 return false; 1238 return false;
1239 } 1239 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index 046658c8498a..654dcc6df97d 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -292,7 +292,7 @@ static enum dm_pp_clocks_state dce_get_required_clocks_state(
292 292
293 low_req_clk = i + 1; 293 low_req_clk = i + 1;
294 if (low_req_clk > clk->max_clks_state) { 294 if (low_req_clk > clk->max_clks_state) {
295 dm_logger_write(clk->ctx->logger, LOG_WARNING, 295 DC_LOG_WARNING(clk->ctx->logger,
296 "%s: clocks unsupported disp_clk %d pix_clk %d", 296 "%s: clocks unsupported disp_clk %d pix_clk %d",
297 __func__, 297 __func__,
298 req_clocks->display_clk_khz, 298 req_clocks->display_clk_khz,
@@ -312,7 +312,7 @@ static bool dce_clock_set_min_clocks_state(
312 312
313 if (clocks_state > clk->max_clks_state) { 313 if (clocks_state > clk->max_clks_state) {
314 /*Requested state exceeds max supported state.*/ 314 /*Requested state exceeds max supported state.*/
315 dm_logger_write(clk->ctx->logger, LOG_WARNING, 315 DC_LOG_WARNING(clk->ctx->logger,
316 "Requested state exceeds max supported state"); 316 "Requested state exceeds max supported state");
317 return false; 317 return false;
318 } else if (clocks_state == clk->cur_min_clks_state) { 318 } else if (clocks_state == clk->cur_min_clks_state) {
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
index 11f50588b3f4..e063a50a5771 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
@@ -827,7 +827,7 @@ void dce110_link_encoder_hw_init(
827 result = link_transmitter_control(enc110, &cntl); 827 result = link_transmitter_control(enc110, &cntl);
828 828
829 if (result != BP_RESULT_OK) { 829 if (result != BP_RESULT_OK) {
830 dm_logger_write(ctx->logger, LOG_ERROR, 830 DC_LOG_ERROR(ctx->logger,
831 "%s: Failed to execute VBIOS command table!\n", 831 "%s: Failed to execute VBIOS command table!\n",
832 __func__); 832 __func__);
833 BREAK_TO_DEBUGGER(); 833 BREAK_TO_DEBUGGER();
@@ -928,7 +928,7 @@ void dce110_link_encoder_enable_tmds_output(
928 result = link_transmitter_control(enc110, &cntl); 928 result = link_transmitter_control(enc110, &cntl);
929 929
930 if (result != BP_RESULT_OK) { 930 if (result != BP_RESULT_OK) {
931 dm_logger_write(ctx->logger, LOG_ERROR, 931 DC_LOG_ERROR(ctx->logger,
932 "%s: Failed to execute VBIOS command table!\n", 932 "%s: Failed to execute VBIOS command table!\n",
933 __func__); 933 __func__);
934 BREAK_TO_DEBUGGER(); 934 BREAK_TO_DEBUGGER();
@@ -969,7 +969,7 @@ void dce110_link_encoder_enable_dp_output(
969 result = link_transmitter_control(enc110, &cntl); 969 result = link_transmitter_control(enc110, &cntl);
970 970
971 if (result != BP_RESULT_OK) { 971 if (result != BP_RESULT_OK) {
972 dm_logger_write(ctx->logger, LOG_ERROR, 972 DC_LOG_ERROR(ctx->logger,
973 "%s: Failed to execute VBIOS command table!\n", 973 "%s: Failed to execute VBIOS command table!\n",
974 __func__); 974 __func__);
975 BREAK_TO_DEBUGGER(); 975 BREAK_TO_DEBUGGER();
@@ -1010,7 +1010,7 @@ void dce110_link_encoder_enable_dp_mst_output(
1010 result = link_transmitter_control(enc110, &cntl); 1010 result = link_transmitter_control(enc110, &cntl);
1011 1011
1012 if (result != BP_RESULT_OK) { 1012 if (result != BP_RESULT_OK) {
1013 dm_logger_write(ctx->logger, LOG_ERROR, 1013 DC_LOG_ERROR(ctx->logger,
1014 "%s: Failed to execute VBIOS command table!\n", 1014 "%s: Failed to execute VBIOS command table!\n",
1015 __func__); 1015 __func__);
1016 BREAK_TO_DEBUGGER(); 1016 BREAK_TO_DEBUGGER();
@@ -1053,7 +1053,7 @@ void dce110_link_encoder_disable_output(
1053 result = link_transmitter_control(enc110, &cntl); 1053 result = link_transmitter_control(enc110, &cntl);
1054 1054
1055 if (result != BP_RESULT_OK) { 1055 if (result != BP_RESULT_OK) {
1056 dm_logger_write(ctx->logger, LOG_ERROR, 1056 DC_LOG_ERROR(ctx->logger,
1057 "%s: Failed to execute VBIOS command table!\n", 1057 "%s: Failed to execute VBIOS command table!\n",
1058 __func__); 1058 __func__);
1059 BREAK_TO_DEBUGGER(); 1059 BREAK_TO_DEBUGGER();
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 8146b9079d51..f4d95126de2e 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
@@ -277,8 +277,8 @@ static void dce110_update_hdmi_info_packet(
277#endif 277#endif
278 default: 278 default:
279 /* invalid HW packet index */ 279 /* invalid HW packet index */
280 dm_logger_write( 280 DC_LOG_WARNING(
281 ctx->logger, LOG_WARNING, 281 ctx->logger,
282 "Invalid HW packet index: %s()\n", 282 "Invalid HW packet index: %s()\n",
283 __func__); 283 __func__);
284 return; 284 return;
@@ -1386,7 +1386,7 @@ static void dce110_se_setup_hdmi_audio(
1386 crtc_info->requested_pixel_clock, 1386 crtc_info->requested_pixel_clock,
1387 crtc_info->calculated_pixel_clock, 1387 crtc_info->calculated_pixel_clock,
1388 &audio_clock_info); 1388 &audio_clock_info);
1389 dm_logger_write(enc->ctx->logger, LOG_HW_AUDIO, 1389 DC_LOG_HW_AUDIO(enc->ctx->logger,
1390 "\n%s:Input::requested_pixel_clock = %d" \ 1390 "\n%s:Input::requested_pixel_clock = %d" \
1391 "calculated_pixel_clock = %d \n", __func__, \ 1391 "calculated_pixel_clock = %d \n", __func__, \
1392 crtc_info->requested_pixel_clock, \ 1392 crtc_info->requested_pixel_clock, \
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
index ad411dac5639..5268197678f5 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
@@ -693,7 +693,7 @@ static int dce_transform_get_max_num_of_supported_lines(
693 break; 693 break;
694 694
695 default: 695 default:
696 dm_logger_write(xfm_dce->base.ctx->logger, LOG_WARNING, 696 DC_LOG_WARNING(xfm_dce->base.ctx->logger,
697 "%s: Invalid LB pixel depth", 697 "%s: Invalid LB pixel depth",
698 __func__); 698 __func__);
699 BREAK_TO_DEBUGGER(); 699 BREAK_TO_DEBUGGER();
@@ -791,7 +791,7 @@ static void dce_transform_set_pixel_storage_depth(
791 if (!(xfm_dce->lb_pixel_depth_supported & depth)) { 791 if (!(xfm_dce->lb_pixel_depth_supported & depth)) {
792 /*we should use unsupported capabilities 792 /*we should use unsupported capabilities
793 * unless it is required by w/a*/ 793 * unless it is required by w/a*/
794 dm_logger_write(xfm->ctx->logger, LOG_WARNING, 794 DC_LOG_WARNING(xfm->ctx->logger,
795 "%s: Capability not supported", 795 "%s: Capability not supported",
796 __func__); 796 __func__);
797 } 797 }
@@ -1172,7 +1172,7 @@ static void program_pwl(struct dce_transform *xfm_dce,
1172 } 1172 }
1173 1173
1174 if (counter == max_tries) { 1174 if (counter == max_tries) {
1175 dm_logger_write(xfm_dce->base.ctx->logger, LOG_WARNING, 1175 DC_LOG_WARNING(xfm_dce->base.ctx->logger,
1176 "%s: regamma lut was not powered on " 1176 "%s: regamma lut was not powered on "
1177 "in a timely manner," 1177 "in a timely manner,"
1178 " programming still proceeds\n", 1178 " programming still proceeds\n",
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
index 6923662413cd..af854f21e9f5 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
@@ -120,13 +120,13 @@ static void wait_for_fbc_state_changed(
120 } 120 }
121 121
122 if (counter == 10) { 122 if (counter == 10) {
123 dm_logger_write( 123 DC_LOG_WARNING(
124 cp110->base.ctx->logger, LOG_WARNING, 124 cp110->base.ctx->logger,
125 "%s: wait counter exceeded, changes to HW not applied", 125 "%s: wait counter exceeded, changes to HW not applied",
126 __func__); 126 __func__);
127 } else { 127 } else {
128 dm_logger_write( 128 DC_LOG_SYNC(
129 cp110->base.ctx->logger, LOG_SYNC, 129 cp110->base.ctx->logger,
130 "FBC status changed to %d", enabled); 130 "FBC status changed to %d", enabled);
131 } 131 }
132 132
@@ -310,8 +310,8 @@ void dce110_compressor_program_compressed_surface_address_and_pitch(
310 if (compressor->min_compress_ratio == FBC_COMPRESS_RATIO_1TO1) 310 if (compressor->min_compress_ratio == FBC_COMPRESS_RATIO_1TO1)
311 fbc_pitch = fbc_pitch / 8; 311 fbc_pitch = fbc_pitch / 8;
312 else 312 else
313 dm_logger_write( 313 DC_LOG_WARNING(
314 compressor->ctx->logger, LOG_WARNING, 314 compressor->ctx->logger,
315 "%s: Unexpected DCE11 compression ratio", 315 "%s: Unexpected DCE11 compression ratio",
316 __func__); 316 __func__);
317 317
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 73e0bcd5ba8f..9e31f06ab4c8 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -816,7 +816,7 @@ void hwss_edp_wait_for_hpd_ready(
816 dal_gpio_destroy_irq(&hpd); 816 dal_gpio_destroy_irq(&hpd);
817 817
818 if (false == edp_hpd_high) { 818 if (false == edp_hpd_high) {
819 dm_logger_write(ctx->logger, LOG_ERROR, 819 DC_LOG_ERROR(ctx->logger,
820 "%s: wait timed out!\n", __func__); 820 "%s: wait timed out!\n", __func__);
821 } 821 }
822} 822}
@@ -840,7 +840,7 @@ void hwss_edp_power_control(
840 if (power_up != is_panel_powered_on(hwseq)) { 840 if (power_up != is_panel_powered_on(hwseq)) {
841 /* Send VBIOS command to prompt eDP panel power */ 841 /* Send VBIOS command to prompt eDP panel power */
842 842
843 dm_logger_write(ctx->logger, LOG_HW_RESUME_S3, 843 DC_LOG_HW_RESUME_S3(ctx->logger,
844 "%s: Panel Power action: %s\n", 844 "%s: Panel Power action: %s\n",
845 __func__, (power_up ? "On":"Off")); 845 __func__, (power_up ? "On":"Off"));
846 846
@@ -856,11 +856,11 @@ void hwss_edp_power_control(
856 bp_result = link_transmitter_control(ctx->dc_bios, &cntl); 856 bp_result = link_transmitter_control(ctx->dc_bios, &cntl);
857 857
858 if (bp_result != BP_RESULT_OK) 858 if (bp_result != BP_RESULT_OK)
859 dm_logger_write(ctx->logger, LOG_ERROR, 859 DC_LOG_ERROR(ctx->logger,
860 "%s: Panel Power bp_result: %d\n", 860 "%s: Panel Power bp_result: %d\n",
861 __func__, bp_result); 861 __func__, bp_result);
862 } else { 862 } else {
863 dm_logger_write(ctx->logger, LOG_HW_RESUME_S3, 863 DC_LOG_HW_RESUME_S3(ctx->logger,
864 "%s: Skipping Panel Power action: %s\n", 864 "%s: Skipping Panel Power action: %s\n",
865 __func__, (power_up ? "On":"Off")); 865 __func__, (power_up ? "On":"Off"));
866 } 866 }
@@ -886,7 +886,7 @@ void hwss_edp_backlight_control(
886 } 886 }
887 887
888 if (enable && is_panel_backlight_on(hws)) { 888 if (enable && is_panel_backlight_on(hws)) {
889 dm_logger_write(ctx->logger, LOG_HW_RESUME_S3, 889 DC_LOG_HW_RESUME_S3(ctx->logger,
890 "%s: panel already powered up. Do nothing.\n", 890 "%s: panel already powered up. Do nothing.\n",
891 __func__); 891 __func__);
892 return; 892 return;
@@ -894,7 +894,7 @@ void hwss_edp_backlight_control(
894 894
895 /* Send VBIOS command to control eDP panel backlight */ 895 /* Send VBIOS command to control eDP panel backlight */
896 896
897 dm_logger_write(ctx->logger, LOG_HW_RESUME_S3, 897 DC_LOG_HW_RESUME_S3(ctx->logger,
898 "%s: backlight action: %s\n", 898 "%s: backlight action: %s\n",
899 __func__, (enable ? "On":"Off")); 899 __func__, (enable ? "On":"Off"));
900 900
@@ -2762,7 +2762,7 @@ static void dce110_program_front_end_for_pipe(
2762 if (pipe_ctx->plane_state->update_flags.bits.full_update) 2762 if (pipe_ctx->plane_state->update_flags.bits.full_update)
2763 dc->hwss.set_output_transfer_func(pipe_ctx, pipe_ctx->stream); 2763 dc->hwss.set_output_transfer_func(pipe_ctx, pipe_ctx->stream);
2764 2764
2765 dm_logger_write(dc->ctx->logger, LOG_SURFACE, 2765 DC_LOG_SURFACE(dc->ctx->logger,
2766 "Pipe:%d 0x%x: addr hi:0x%x, " 2766 "Pipe:%d 0x%x: addr hi:0x%x, "
2767 "addr low:0x%x, " 2767 "addr low:0x%x, "
2768 "src: %d, %d, %d," 2768 "src: %d, %d, %d,"
@@ -2785,7 +2785,7 @@ static void dce110_program_front_end_for_pipe(
2785 pipe_ctx->plane_state->clip_rect.width, 2785 pipe_ctx->plane_state->clip_rect.width,
2786 pipe_ctx->plane_state->clip_rect.height); 2786 pipe_ctx->plane_state->clip_rect.height);
2787 2787
2788 dm_logger_write(dc->ctx->logger, LOG_SURFACE, 2788 DC_LOG_SURFACE(dc->ctx->logger,
2789 "Pipe %d: width, height, x, y\n" 2789 "Pipe %d: width, height, x, y\n"
2790 "viewport:%d, %d, %d, %d\n" 2790 "viewport:%d, %d, %d, %d\n"
2791 "recout: %d, %d, %d, %d\n", 2791 "recout: %d, %d, %d, %d\n",
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index c4e877ac95d3..d938047fc17f 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -771,8 +771,8 @@ static bool dce110_validate_bandwidth(
771{ 771{
772 bool result = false; 772 bool result = false;
773 773
774 dm_logger_write( 774 DC_LOG_BANDWIDTH_CALCS(
775 dc->ctx->logger, LOG_BANDWIDTH_CALCS, 775 dc->ctx->logger,
776 "%s: start", 776 "%s: start",
777 __func__); 777 __func__);
778 778
@@ -786,7 +786,7 @@ static bool dce110_validate_bandwidth(
786 result = true; 786 result = true;
787 787
788 if (!result) 788 if (!result)
789 dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_VALIDATION, 789 DC_LOG_BANDWIDTH_VALIDATION(dc->ctx->logger,
790 "%s: %dx%d@%d Bandwidth validation failed!\n", 790 "%s: %dx%d@%d Bandwidth validation failed!\n",
791 __func__, 791 __func__,
792 context->streams[0]->timing.h_addressable, 792 context->streams[0]->timing.h_addressable,
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.c
index 59b4cd329715..a8e93072ab5c 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.c
@@ -606,7 +606,7 @@ static uint32_t dce110_timing_generator_v_get_vblank_counter(struct timing_gener
606static bool dce110_timing_generator_v_did_triggered_reset_occur( 606static bool dce110_timing_generator_v_did_triggered_reset_occur(
607 struct timing_generator *tg) 607 struct timing_generator *tg)
608{ 608{
609 dm_logger_write(tg->ctx->logger, LOG_ERROR, 609 DC_LOG_ERROR(tg->ctx->logger,
610 "Timing Sync not supported on underlay pipe\n"); 610 "Timing Sync not supported on underlay pipe\n");
611 return false; 611 return false;
612} 612}
@@ -615,7 +615,7 @@ static void dce110_timing_generator_v_setup_global_swap_lock(
615 struct timing_generator *tg, 615 struct timing_generator *tg,
616 const struct dcp_gsl_params *gsl_params) 616 const struct dcp_gsl_params *gsl_params)
617{ 617{
618 dm_logger_write(tg->ctx->logger, LOG_ERROR, 618 DC_LOG_ERROR(tg->ctx->logger,
619 "Timing Sync not supported on underlay pipe\n"); 619 "Timing Sync not supported on underlay pipe\n");
620 return; 620 return;
621} 621}
@@ -624,7 +624,7 @@ static void dce110_timing_generator_v_enable_reset_trigger(
624 struct timing_generator *tg, 624 struct timing_generator *tg,
625 int source_tg_inst) 625 int source_tg_inst)
626{ 626{
627 dm_logger_write(tg->ctx->logger, LOG_ERROR, 627 DC_LOG_ERROR(tg->ctx->logger,
628 "Timing Sync not supported on underlay pipe\n"); 628 "Timing Sync not supported on underlay pipe\n");
629 return; 629 return;
630} 630}
@@ -632,7 +632,7 @@ static void dce110_timing_generator_v_enable_reset_trigger(
632static void dce110_timing_generator_v_disable_reset_trigger( 632static void dce110_timing_generator_v_disable_reset_trigger(
633 struct timing_generator *tg) 633 struct timing_generator *tg)
634{ 634{
635 dm_logger_write(tg->ctx->logger, LOG_ERROR, 635 DC_LOG_ERROR(tg->ctx->logger,
636 "Timing Sync not supported on underlay pipe\n"); 636 "Timing Sync not supported on underlay pipe\n");
637 return; 637 return;
638} 638}
@@ -640,7 +640,7 @@ static void dce110_timing_generator_v_disable_reset_trigger(
640static void dce110_timing_generator_v_tear_down_global_swap_lock( 640static void dce110_timing_generator_v_tear_down_global_swap_lock(
641 struct timing_generator *tg) 641 struct timing_generator *tg)
642{ 642{
643 dm_logger_write(tg->ctx->logger, LOG_ERROR, 643 DC_LOG_ERROR(tg->ctx->logger,
644 "Timing Sync not supported on underlay pipe\n"); 644 "Timing Sync not supported on underlay pipe\n");
645 return; 645 return;
646} 646}
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c
index 47390dc58306..809db96a8ba5 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c
@@ -670,7 +670,7 @@ static void dce110_xfmv_set_pixel_storage_depth(
670 if (!(xfm_dce->lb_pixel_depth_supported & depth)) { 670 if (!(xfm_dce->lb_pixel_depth_supported & depth)) {
671 /*we should use unsupported capabilities 671 /*we should use unsupported capabilities
672 * unless it is required by w/a*/ 672 * unless it is required by w/a*/
673 dm_logger_write(xfm->ctx->logger, LOG_WARNING, 673 DC_LOG_WARNING(xfm->ctx->logger,
674 "%s: Capability not supported", 674 "%s: Capability not supported",
675 __func__); 675 __func__);
676 } 676 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
index 69649928768c..196ddd01615c 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
@@ -129,8 +129,8 @@ static uint32_t lpt_memory_control_config(struct dce112_compressor *cp110,
129 LOW_POWER_TILING_NUM_PIPES); 129 LOW_POWER_TILING_NUM_PIPES);
130 break; 130 break;
131 default: 131 default:
132 dm_logger_write( 132 DC_LOG_WARNING(
133 cp110->base.ctx->logger, LOG_WARNING, 133 cp110->base.ctx->logger,
134 "%s: Invalid LPT NUM_PIPES!!!", 134 "%s: Invalid LPT NUM_PIPES!!!",
135 __func__); 135 __func__);
136 break; 136 break;
@@ -175,8 +175,8 @@ static uint32_t lpt_memory_control_config(struct dce112_compressor *cp110,
175 LOW_POWER_TILING_NUM_BANKS); 175 LOW_POWER_TILING_NUM_BANKS);
176 break; 176 break;
177 default: 177 default:
178 dm_logger_write( 178 DC_LOG_WARNING(
179 cp110->base.ctx->logger, LOG_WARNING, 179 cp110->base.ctx->logger,
180 "%s: Invalid LPT NUM_BANKS!!!", 180 "%s: Invalid LPT NUM_BANKS!!!",
181 __func__); 181 __func__);
182 break; 182 break;
@@ -209,8 +209,8 @@ static uint32_t lpt_memory_control_config(struct dce112_compressor *cp110,
209 LOW_POWER_TILING_PIPE_INTERLEAVE_SIZE); 209 LOW_POWER_TILING_PIPE_INTERLEAVE_SIZE);
210 break; 210 break;
211 default: 211 default:
212 dm_logger_write( 212 DC_LOG_WARNING(
213 cp110->base.ctx->logger, LOG_WARNING, 213 cp110->base.ctx->logger,
214 "%s: Invalid LPT INTERLEAVE_SIZE!!!", 214 "%s: Invalid LPT INTERLEAVE_SIZE!!!",
215 __func__); 215 __func__);
216 break; 216 break;
@@ -253,15 +253,15 @@ static uint32_t lpt_memory_control_config(struct dce112_compressor *cp110,
253 LOW_POWER_TILING_ROW_SIZE); 253 LOW_POWER_TILING_ROW_SIZE);
254 break; 254 break;
255 default: 255 default:
256 dm_logger_write( 256 DC_LOG_WARNING(
257 cp110->base.ctx->logger, LOG_WARNING, 257 cp110->base.ctx->logger,
258 "%s: Invalid LPT ROW_SIZE!!!", 258 "%s: Invalid LPT ROW_SIZE!!!",
259 __func__); 259 __func__);
260 break; 260 break;
261 } 261 }
262 } else { 262 } else {
263 dm_logger_write( 263 DC_LOG_WARNING(
264 cp110->base.ctx->logger, LOG_WARNING, 264 cp110->base.ctx->logger,
265 "%s: LPT MC Configuration is not provided", 265 "%s: LPT MC Configuration is not provided",
266 __func__); 266 __func__);
267 } 267 }
@@ -311,8 +311,8 @@ static void wait_for_fbc_state_changed(
311 } 311 }
312 312
313 if (counter == 10) { 313 if (counter == 10) {
314 dm_logger_write( 314 DC_LOG_WARNING(
315 cp110->base.ctx->logger, LOG_WARNING, 315 cp110->base.ctx->logger,
316 "%s: wait counter exceeded, changes to HW not applied", 316 "%s: wait counter exceeded, changes to HW not applied",
317 __func__); 317 __func__);
318 } 318 }
@@ -525,8 +525,8 @@ void dce112_compressor_program_compressed_surface_address_and_pitch(
525 if (compressor->min_compress_ratio == FBC_COMPRESS_RATIO_1TO1) 525 if (compressor->min_compress_ratio == FBC_COMPRESS_RATIO_1TO1)
526 fbc_pitch = fbc_pitch / 8; 526 fbc_pitch = fbc_pitch / 8;
527 else 527 else
528 dm_logger_write( 528 DC_LOG_WARNING(
529 compressor->ctx->logger, LOG_WARNING, 529 compressor->ctx->logger,
530 "%s: Unexpected DCE11 compression ratio", 530 "%s: Unexpected DCE11 compression ratio",
531 __func__); 531 __func__);
532 532
@@ -690,8 +690,8 @@ void dce112_compressor_program_lpt_control(
690 LOW_POWER_TILING_MODE); 690 LOW_POWER_TILING_MODE);
691 break; 691 break;
692 default: 692 default:
693 dm_logger_write( 693 DC_LOG_WARNING(
694 compressor->ctx->logger, LOG_WARNING, 694 compressor->ctx->logger,
695 "%s: Invalid selected DRAM channels for LPT!!!", 695 "%s: Invalid selected DRAM channels for LPT!!!",
696 __func__); 696 __func__);
697 break; 697 break;
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index c0757dd6c03c..bf885d7e699b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -722,8 +722,8 @@ bool dce112_validate_bandwidth(
722{ 722{
723 bool result = false; 723 bool result = false;
724 724
725 dm_logger_write( 725 DC_LOG_BANDWIDTH_CALCS(
726 dc->ctx->logger, LOG_BANDWIDTH_CALCS, 726 dc->ctx->logger,
727 "%s: start", 727 "%s: start",
728 __func__); 728 __func__);
729 729
@@ -737,7 +737,7 @@ bool dce112_validate_bandwidth(
737 result = true; 737 result = true;
738 738
739 if (!result) 739 if (!result)
740 dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_VALIDATION, 740 DC_LOG_BANDWIDTH_VALIDATION(dc->ctx->logger,
741 "%s: Bandwidth validation failed!", 741 "%s: Bandwidth validation failed!",
742 __func__); 742 __func__);
743 743
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
index f984583b9caa..c1711f79ce6d 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
@@ -147,7 +147,7 @@ bool hubbub1_verify_allow_pstate_change_high(
147 if (debug_data & (1 << 30)) { 147 if (debug_data & (1 << 30)) {
148 148
149 if (i > pstate_wait_expected_timeout_us) 149 if (i > pstate_wait_expected_timeout_us)
150 dm_logger_write(hubbub->ctx->logger, LOG_WARNING, 150 DC_LOG_WARNING(hubbub->ctx->logger,
151 "pstate took longer than expected ~%dus\n", 151 "pstate took longer than expected ~%dus\n",
152 i); 152 i);
153 153
@@ -167,7 +167,7 @@ bool hubbub1_verify_allow_pstate_change_high(
167 DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_ENABLE, 1); 167 DCHUBBUB_ARB_ALLOW_PSTATE_CHANGE_FORCE_ENABLE, 1);
168 forced_pstate_allow = true; 168 forced_pstate_allow = true;
169 169
170 dm_logger_write(hubbub->ctx->logger, LOG_WARNING, 170 DC_LOG_WARNING(hubbub->ctx->logger,
171 "pstate TEST_DEBUG_DATA: 0x%X\n", 171 "pstate TEST_DEBUG_DATA: 0x%X\n",
172 debug_data); 172 debug_data);
173 173
@@ -211,7 +211,7 @@ void hubbub1_program_watermarks(
211 refclk_mhz, 0x1fffff); 211 refclk_mhz, 0x1fffff);
212 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_A, prog_wm_value); 212 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_A, prog_wm_value);
213 213
214 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 214 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
215 "URGENCY_WATERMARK_A calculated =%d\n" 215 "URGENCY_WATERMARK_A calculated =%d\n"
216 "HW register value = 0x%x\n", 216 "HW register value = 0x%x\n",
217 watermarks->a.urgent_ns, prog_wm_value); 217 watermarks->a.urgent_ns, prog_wm_value);
@@ -219,7 +219,7 @@ void hubbub1_program_watermarks(
219 prog_wm_value = convert_and_clamp(watermarks->a.pte_meta_urgent_ns, 219 prog_wm_value = convert_and_clamp(watermarks->a.pte_meta_urgent_ns,
220 refclk_mhz, 0x1fffff); 220 refclk_mhz, 0x1fffff);
221 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_A, prog_wm_value); 221 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_A, prog_wm_value);
222 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 222 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
223 "PTE_META_URGENCY_WATERMARK_A calculated =%d\n" 223 "PTE_META_URGENCY_WATERMARK_A calculated =%d\n"
224 "HW register value = 0x%x\n", 224 "HW register value = 0x%x\n",
225 watermarks->a.pte_meta_urgent_ns, prog_wm_value); 225 watermarks->a.pte_meta_urgent_ns, prog_wm_value);
@@ -229,7 +229,7 @@ void hubbub1_program_watermarks(
229 watermarks->a.cstate_pstate.cstate_enter_plus_exit_ns, 229 watermarks->a.cstate_pstate.cstate_enter_plus_exit_ns,
230 refclk_mhz, 0x1fffff); 230 refclk_mhz, 0x1fffff);
231 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A, prog_wm_value); 231 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A, prog_wm_value);
232 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 232 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
233 "SR_ENTER_EXIT_WATERMARK_A calculated =%d\n" 233 "SR_ENTER_EXIT_WATERMARK_A calculated =%d\n"
234 "HW register value = 0x%x\n", 234 "HW register value = 0x%x\n",
235 watermarks->a.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value); 235 watermarks->a.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value);
@@ -239,7 +239,7 @@ void hubbub1_program_watermarks(
239 watermarks->a.cstate_pstate.cstate_exit_ns, 239 watermarks->a.cstate_pstate.cstate_exit_ns,
240 refclk_mhz, 0x1fffff); 240 refclk_mhz, 0x1fffff);
241 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_A, prog_wm_value); 241 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_A, prog_wm_value);
242 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 242 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
243 "SR_EXIT_WATERMARK_A calculated =%d\n" 243 "SR_EXIT_WATERMARK_A calculated =%d\n"
244 "HW register value = 0x%x\n", 244 "HW register value = 0x%x\n",
245 watermarks->a.cstate_pstate.cstate_exit_ns, prog_wm_value); 245 watermarks->a.cstate_pstate.cstate_exit_ns, prog_wm_value);
@@ -249,7 +249,7 @@ void hubbub1_program_watermarks(
249 watermarks->a.cstate_pstate.pstate_change_ns, 249 watermarks->a.cstate_pstate.pstate_change_ns,
250 refclk_mhz, 0x1fffff); 250 refclk_mhz, 0x1fffff);
251 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_A, prog_wm_value); 251 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_A, prog_wm_value);
252 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 252 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
253 "DRAM_CLK_CHANGE_WATERMARK_A calculated =%d\n" 253 "DRAM_CLK_CHANGE_WATERMARK_A calculated =%d\n"
254 "HW register value = 0x%x\n\n", 254 "HW register value = 0x%x\n\n",
255 watermarks->a.cstate_pstate.pstate_change_ns, prog_wm_value); 255 watermarks->a.cstate_pstate.pstate_change_ns, prog_wm_value);
@@ -259,7 +259,7 @@ void hubbub1_program_watermarks(
259 prog_wm_value = convert_and_clamp( 259 prog_wm_value = convert_and_clamp(
260 watermarks->b.urgent_ns, refclk_mhz, 0x1fffff); 260 watermarks->b.urgent_ns, refclk_mhz, 0x1fffff);
261 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_B, prog_wm_value); 261 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_B, prog_wm_value);
262 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 262 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
263 "URGENCY_WATERMARK_B calculated =%d\n" 263 "URGENCY_WATERMARK_B calculated =%d\n"
264 "HW register value = 0x%x\n", 264 "HW register value = 0x%x\n",
265 watermarks->b.urgent_ns, prog_wm_value); 265 watermarks->b.urgent_ns, prog_wm_value);
@@ -269,7 +269,7 @@ void hubbub1_program_watermarks(
269 watermarks->b.pte_meta_urgent_ns, 269 watermarks->b.pte_meta_urgent_ns,
270 refclk_mhz, 0x1fffff); 270 refclk_mhz, 0x1fffff);
271 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_B, prog_wm_value); 271 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_B, prog_wm_value);
272 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 272 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
273 "PTE_META_URGENCY_WATERMARK_B calculated =%d\n" 273 "PTE_META_URGENCY_WATERMARK_B calculated =%d\n"
274 "HW register value = 0x%x\n", 274 "HW register value = 0x%x\n",
275 watermarks->b.pte_meta_urgent_ns, prog_wm_value); 275 watermarks->b.pte_meta_urgent_ns, prog_wm_value);
@@ -280,7 +280,7 @@ void hubbub1_program_watermarks(
280 watermarks->b.cstate_pstate.cstate_enter_plus_exit_ns, 280 watermarks->b.cstate_pstate.cstate_enter_plus_exit_ns,
281 refclk_mhz, 0x1fffff); 281 refclk_mhz, 0x1fffff);
282 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_B, prog_wm_value); 282 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_B, prog_wm_value);
283 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 283 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
284 "SR_ENTER_WATERMARK_B calculated =%d\n" 284 "SR_ENTER_WATERMARK_B calculated =%d\n"
285 "HW register value = 0x%x\n", 285 "HW register value = 0x%x\n",
286 watermarks->b.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value); 286 watermarks->b.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value);
@@ -290,7 +290,7 @@ void hubbub1_program_watermarks(
290 watermarks->b.cstate_pstate.cstate_exit_ns, 290 watermarks->b.cstate_pstate.cstate_exit_ns,
291 refclk_mhz, 0x1fffff); 291 refclk_mhz, 0x1fffff);
292 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_B, prog_wm_value); 292 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_B, prog_wm_value);
293 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 293 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
294 "SR_EXIT_WATERMARK_B calculated =%d\n" 294 "SR_EXIT_WATERMARK_B calculated =%d\n"
295 "HW register value = 0x%x\n", 295 "HW register value = 0x%x\n",
296 watermarks->b.cstate_pstate.cstate_exit_ns, prog_wm_value); 296 watermarks->b.cstate_pstate.cstate_exit_ns, prog_wm_value);
@@ -300,7 +300,7 @@ void hubbub1_program_watermarks(
300 watermarks->b.cstate_pstate.pstate_change_ns, 300 watermarks->b.cstate_pstate.pstate_change_ns,
301 refclk_mhz, 0x1fffff); 301 refclk_mhz, 0x1fffff);
302 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_B, prog_wm_value); 302 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_B, prog_wm_value);
303 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 303 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
304 "DRAM_CLK_CHANGE_WATERMARK_B calculated =%d\n\n" 304 "DRAM_CLK_CHANGE_WATERMARK_B calculated =%d\n\n"
305 "HW register value = 0x%x\n", 305 "HW register value = 0x%x\n",
306 watermarks->b.cstate_pstate.pstate_change_ns, prog_wm_value); 306 watermarks->b.cstate_pstate.pstate_change_ns, prog_wm_value);
@@ -309,7 +309,7 @@ void hubbub1_program_watermarks(
309 prog_wm_value = convert_and_clamp( 309 prog_wm_value = convert_and_clamp(
310 watermarks->c.urgent_ns, refclk_mhz, 0x1fffff); 310 watermarks->c.urgent_ns, refclk_mhz, 0x1fffff);
311 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_C, prog_wm_value); 311 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_C, prog_wm_value);
312 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 312 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
313 "URGENCY_WATERMARK_C calculated =%d\n" 313 "URGENCY_WATERMARK_C calculated =%d\n"
314 "HW register value = 0x%x\n", 314 "HW register value = 0x%x\n",
315 watermarks->c.urgent_ns, prog_wm_value); 315 watermarks->c.urgent_ns, prog_wm_value);
@@ -319,7 +319,7 @@ void hubbub1_program_watermarks(
319 watermarks->c.pte_meta_urgent_ns, 319 watermarks->c.pte_meta_urgent_ns,
320 refclk_mhz, 0x1fffff); 320 refclk_mhz, 0x1fffff);
321 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_C, prog_wm_value); 321 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_C, prog_wm_value);
322 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 322 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
323 "PTE_META_URGENCY_WATERMARK_C calculated =%d\n" 323 "PTE_META_URGENCY_WATERMARK_C calculated =%d\n"
324 "HW register value = 0x%x\n", 324 "HW register value = 0x%x\n",
325 watermarks->c.pte_meta_urgent_ns, prog_wm_value); 325 watermarks->c.pte_meta_urgent_ns, prog_wm_value);
@@ -330,7 +330,7 @@ void hubbub1_program_watermarks(
330 watermarks->c.cstate_pstate.cstate_enter_plus_exit_ns, 330 watermarks->c.cstate_pstate.cstate_enter_plus_exit_ns,
331 refclk_mhz, 0x1fffff); 331 refclk_mhz, 0x1fffff);
332 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_C, prog_wm_value); 332 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_C, prog_wm_value);
333 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 333 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
334 "SR_ENTER_WATERMARK_C calculated =%d\n" 334 "SR_ENTER_WATERMARK_C calculated =%d\n"
335 "HW register value = 0x%x\n", 335 "HW register value = 0x%x\n",
336 watermarks->c.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value); 336 watermarks->c.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value);
@@ -340,7 +340,7 @@ void hubbub1_program_watermarks(
340 watermarks->c.cstate_pstate.cstate_exit_ns, 340 watermarks->c.cstate_pstate.cstate_exit_ns,
341 refclk_mhz, 0x1fffff); 341 refclk_mhz, 0x1fffff);
342 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_C, prog_wm_value); 342 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_C, prog_wm_value);
343 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 343 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
344 "SR_EXIT_WATERMARK_C calculated =%d\n" 344 "SR_EXIT_WATERMARK_C calculated =%d\n"
345 "HW register value = 0x%x\n", 345 "HW register value = 0x%x\n",
346 watermarks->c.cstate_pstate.cstate_exit_ns, prog_wm_value); 346 watermarks->c.cstate_pstate.cstate_exit_ns, prog_wm_value);
@@ -350,7 +350,7 @@ void hubbub1_program_watermarks(
350 watermarks->c.cstate_pstate.pstate_change_ns, 350 watermarks->c.cstate_pstate.pstate_change_ns,
351 refclk_mhz, 0x1fffff); 351 refclk_mhz, 0x1fffff);
352 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_C, prog_wm_value); 352 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_C, prog_wm_value);
353 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 353 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
354 "DRAM_CLK_CHANGE_WATERMARK_C calculated =%d\n\n" 354 "DRAM_CLK_CHANGE_WATERMARK_C calculated =%d\n\n"
355 "HW register value = 0x%x\n", 355 "HW register value = 0x%x\n",
356 watermarks->c.cstate_pstate.pstate_change_ns, prog_wm_value); 356 watermarks->c.cstate_pstate.pstate_change_ns, prog_wm_value);
@@ -359,7 +359,7 @@ void hubbub1_program_watermarks(
359 prog_wm_value = convert_and_clamp( 359 prog_wm_value = convert_and_clamp(
360 watermarks->d.urgent_ns, refclk_mhz, 0x1fffff); 360 watermarks->d.urgent_ns, refclk_mhz, 0x1fffff);
361 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_D, prog_wm_value); 361 REG_WRITE(DCHUBBUB_ARB_DATA_URGENCY_WATERMARK_D, prog_wm_value);
362 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 362 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
363 "URGENCY_WATERMARK_D calculated =%d\n" 363 "URGENCY_WATERMARK_D calculated =%d\n"
364 "HW register value = 0x%x\n", 364 "HW register value = 0x%x\n",
365 watermarks->d.urgent_ns, prog_wm_value); 365 watermarks->d.urgent_ns, prog_wm_value);
@@ -368,7 +368,7 @@ void hubbub1_program_watermarks(
368 watermarks->d.pte_meta_urgent_ns, 368 watermarks->d.pte_meta_urgent_ns,
369 refclk_mhz, 0x1fffff); 369 refclk_mhz, 0x1fffff);
370 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_D, prog_wm_value); 370 REG_WRITE(DCHUBBUB_ARB_PTE_META_URGENCY_WATERMARK_D, prog_wm_value);
371 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 371 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
372 "PTE_META_URGENCY_WATERMARK_D calculated =%d\n" 372 "PTE_META_URGENCY_WATERMARK_D calculated =%d\n"
373 "HW register value = 0x%x\n", 373 "HW register value = 0x%x\n",
374 watermarks->d.pte_meta_urgent_ns, prog_wm_value); 374 watermarks->d.pte_meta_urgent_ns, prog_wm_value);
@@ -379,7 +379,7 @@ void hubbub1_program_watermarks(
379 watermarks->d.cstate_pstate.cstate_enter_plus_exit_ns, 379 watermarks->d.cstate_pstate.cstate_enter_plus_exit_ns,
380 refclk_mhz, 0x1fffff); 380 refclk_mhz, 0x1fffff);
381 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_D, prog_wm_value); 381 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_D, prog_wm_value);
382 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 382 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
383 "SR_ENTER_WATERMARK_D calculated =%d\n" 383 "SR_ENTER_WATERMARK_D calculated =%d\n"
384 "HW register value = 0x%x\n", 384 "HW register value = 0x%x\n",
385 watermarks->d.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value); 385 watermarks->d.cstate_pstate.cstate_enter_plus_exit_ns, prog_wm_value);
@@ -389,7 +389,7 @@ void hubbub1_program_watermarks(
389 watermarks->d.cstate_pstate.cstate_exit_ns, 389 watermarks->d.cstate_pstate.cstate_exit_ns,
390 refclk_mhz, 0x1fffff); 390 refclk_mhz, 0x1fffff);
391 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_D, prog_wm_value); 391 REG_WRITE(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_D, prog_wm_value);
392 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 392 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
393 "SR_EXIT_WATERMARK_D calculated =%d\n" 393 "SR_EXIT_WATERMARK_D calculated =%d\n"
394 "HW register value = 0x%x\n", 394 "HW register value = 0x%x\n",
395 watermarks->d.cstate_pstate.cstate_exit_ns, prog_wm_value); 395 watermarks->d.cstate_pstate.cstate_exit_ns, prog_wm_value);
@@ -400,7 +400,7 @@ void hubbub1_program_watermarks(
400 watermarks->d.cstate_pstate.pstate_change_ns, 400 watermarks->d.cstate_pstate.pstate_change_ns,
401 refclk_mhz, 0x1fffff); 401 refclk_mhz, 0x1fffff);
402 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_D, prog_wm_value); 402 REG_WRITE(DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_D, prog_wm_value);
403 dm_logger_write(hubbub->ctx->logger, LOG_BANDWIDTH_CALCS, 403 DC_LOG_BANDWIDTH_CALCS(hubbub->ctx->logger,
404 "DRAM_CLK_CHANGE_WATERMARK_D calculated =%d\n" 404 "DRAM_CLK_CHANGE_WATERMARK_D calculated =%d\n"
405 "HW register value = 0x%x\n\n", 405 "HW register value = 0x%x\n\n",
406 watermarks->d.cstate_pstate.pstate_change_ns, prog_wm_value); 406 watermarks->d.cstate_pstate.pstate_change_ns, prog_wm_value);
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 b4a6b6729e62..aa5516539c95 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -335,7 +335,7 @@ static void power_on_plane(
335 hubp_pg_control(hws, plane_id, true); 335 hubp_pg_control(hws, plane_id, true);
336 REG_SET(DC_IP_REQUEST_CNTL, 0, 336 REG_SET(DC_IP_REQUEST_CNTL, 0,
337 IP_REQUEST_EN, 0); 337 IP_REQUEST_EN, 0);
338 dm_logger_write(hws->ctx->logger, LOG_DEBUG, 338 DC_LOG_DEBUG(hws->ctx->logger,
339 "Un-gated front end for pipe %d\n", plane_id); 339 "Un-gated front end for pipe %d\n", plane_id);
340 } 340 }
341} 341}
@@ -572,7 +572,7 @@ static void reset_back_end_for_pipe(
572 return; 572 return;
573 573
574 pipe_ctx->stream = NULL; 574 pipe_ctx->stream = NULL;
575 dm_logger_write(dc->ctx->logger, LOG_DEBUG, 575 DC_LOG_DEBUG(dc->ctx->logger,
576 "Reset back end for pipe %d, tg:%d\n", 576 "Reset back end for pipe %d, tg:%d\n",
577 pipe_ctx->pipe_idx, pipe_ctx->stream_res.tg->inst); 577 pipe_ctx->pipe_idx, pipe_ctx->stream_res.tg->inst);
578} 578}
@@ -632,7 +632,7 @@ static void plane_atomic_power_down(struct dc *dc, struct pipe_ctx *pipe_ctx)
632 dpp->funcs->dpp_reset(dpp); 632 dpp->funcs->dpp_reset(dpp);
633 REG_SET(DC_IP_REQUEST_CNTL, 0, 633 REG_SET(DC_IP_REQUEST_CNTL, 0,
634 IP_REQUEST_EN, 0); 634 IP_REQUEST_EN, 0);
635 dm_logger_write(dc->ctx->logger, LOG_DEBUG, 635 DC_LOG_DEBUG(dc->ctx->logger,
636 "Power gated front end %d\n", pipe_ctx->pipe_idx); 636 "Power gated front end %d\n", pipe_ctx->pipe_idx);
637 } 637 }
638} 638}
@@ -679,7 +679,7 @@ static void dcn10_disable_plane(struct dc *dc, struct pipe_ctx *pipe_ctx)
679 679
680 apply_DEGVIDCN10_253_wa(dc); 680 apply_DEGVIDCN10_253_wa(dc);
681 681
682 dm_logger_write(dc->ctx->logger, LOG_DC, 682 DC_LOG_DC(dc->ctx->logger,
683 "Power down front end %d\n", 683 "Power down front end %d\n",
684 pipe_ctx->pipe_idx); 684 pipe_ctx->pipe_idx);
685} 685}
@@ -1102,7 +1102,7 @@ static void dcn10_enable_per_frame_crtc_position_reset(
1102 struct dc *core_dc, 1102 struct dc *core_dc,
1103 struct pipe_ctx *pipe_ctx) 1103 struct pipe_ctx *pipe_ctx)
1104{ 1104{
1105 dm_logger_write(core_dc->ctx->logger, LOG_BANDWIDTH_CALCS, 1105 DC_LOG_BANDWIDTH_CALCS(core_dc->ctx->logger,
1106 "\n============== DML TTU Output parameters [%d] ==============\n" 1106 "\n============== DML TTU Output parameters [%d] ==============\n"
1107 "qos_level_low_wm: %d, \n" 1107 "qos_level_low_wm: %d, \n"
1108 "qos_level_high_wm: %d, \n" 1108 "qos_level_high_wm: %d, \n"
@@ -1132,7 +1132,7 @@ static void dcn10_enable_per_frame_crtc_position_reset(
1132 pipe_ctx->ttu_regs.refcyc_per_req_delivery_pre_c 1132 pipe_ctx->ttu_regs.refcyc_per_req_delivery_pre_c
1133 ); 1133 );
1134 1134
1135 dm_logger_write(core_dc->ctx->logger, LOG_BANDWIDTH_CALCS, 1135 DC_LOG_BANDWIDTH_CALCS(core_dc->ctx->logger,
1136 "\n============== DML DLG Output parameters [%d] ==============\n" 1136 "\n============== DML DLG Output parameters [%d] ==============\n"
1137 "refcyc_h_blank_end: %d, \n" 1137 "refcyc_h_blank_end: %d, \n"
1138 "dlg_vblank_end: %d, \n" 1138 "dlg_vblank_end: %d, \n"
@@ -1167,7 +1167,7 @@ static void dcn10_enable_per_frame_crtc_position_reset(
1167 pipe_ctx->dlg_regs.refcyc_per_pte_group_nom_l 1167 pipe_ctx->dlg_regs.refcyc_per_pte_group_nom_l
1168 ); 1168 );
1169 1169
1170 dm_logger_write(core_dc->ctx->logger, LOG_BANDWIDTH_CALCS, 1170 DC_LOG_BANDWIDTH_CALCS(core_dc->ctx->logger,
1171 "\ndst_y_per_meta_row_nom_l: %d, \n" 1171 "\ndst_y_per_meta_row_nom_l: %d, \n"
1172 "refcyc_per_meta_chunk_nom_l: %d, \n" 1172 "refcyc_per_meta_chunk_nom_l: %d, \n"
1173 "refcyc_per_line_delivery_pre_l: %d, \n" 1173 "refcyc_per_line_delivery_pre_l: %d, \n"
@@ -1197,7 +1197,7 @@ static void dcn10_enable_per_frame_crtc_position_reset(
1197 pipe_ctx->dlg_regs.refcyc_per_line_delivery_c 1197 pipe_ctx->dlg_regs.refcyc_per_line_delivery_c
1198 ); 1198 );
1199 1199
1200 dm_logger_write(core_dc->ctx->logger, LOG_BANDWIDTH_CALCS, 1200 DC_LOG_BANDWIDTH_CALCS(core_dc->ctx->logger,
1201 "\n============== DML RQ Output parameters [%d] ==============\n" 1201 "\n============== DML RQ Output parameters [%d] ==============\n"
1202 "chunk_size: %d \n" 1202 "chunk_size: %d \n"
1203 "min_chunk_size: %d \n" 1203 "min_chunk_size: %d \n"
@@ -1330,7 +1330,7 @@ static void dcn10_enable_plane(
1330 1330
1331/* TODO: enable/disable in dm as per update type. 1331/* TODO: enable/disable in dm as per update type.
1332 if (plane_state) { 1332 if (plane_state) {
1333 dm_logger_write(dc->ctx->logger, LOG_DC, 1333 DC_LOG_DC(dc->ctx->logger,
1334 "Pipe:%d 0x%x: addr hi:0x%x, " 1334 "Pipe:%d 0x%x: addr hi:0x%x, "
1335 "addr low:0x%x, " 1335 "addr low:0x%x, "
1336 "src: %d, %d, %d," 1336 "src: %d, %d, %d,"
@@ -1348,7 +1348,7 @@ static void dcn10_enable_plane(
1348 plane_state->dst_rect.width, 1348 plane_state->dst_rect.width,
1349 plane_state->dst_rect.height); 1349 plane_state->dst_rect.height);
1350 1350
1351 dm_logger_write(dc->ctx->logger, LOG_DC, 1351 DC_LOG_DC(dc->ctx->logger,
1352 "Pipe %d: width, height, x, y format:%d\n" 1352 "Pipe %d: width, height, x, y format:%d\n"
1353 "viewport:%d, %d, %d, %d\n" 1353 "viewport:%d, %d, %d, %d\n"
1354 "recout: %d, %d, %d, %d\n", 1354 "recout: %d, %d, %d, %d\n",
@@ -1959,7 +1959,7 @@ static void dcn10_apply_ctx_for_surface(
1959 plane_atomic_disconnect(dc, old_pipe_ctx); 1959 plane_atomic_disconnect(dc, old_pipe_ctx);
1960 removed_pipe[i] = true; 1960 removed_pipe[i] = true;
1961 1961
1962 dm_logger_write(dc->ctx->logger, LOG_DC, 1962 DC_LOG_DC(dc->ctx->logger,
1963 "Reset mpcc for pipe %d\n", 1963 "Reset mpcc for pipe %d\n",
1964 old_pipe_ctx->pipe_idx); 1964 old_pipe_ctx->pipe_idx);
1965 } 1965 }
@@ -2002,7 +2002,7 @@ static void dcn10_apply_ctx_for_surface(
2002 dcn10_verify_allow_pstate_change_high(dc); 2002 dcn10_verify_allow_pstate_change_high(dc);
2003 } 2003 }
2004 } 2004 }
2005/* dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS, 2005/* DC_LOG_BANDWIDTH_CALCS(dc->ctx->logger,
2006 "\n============== Watermark parameters ==============\n" 2006 "\n============== Watermark parameters ==============\n"
2007 "a.urgent_ns: %d \n" 2007 "a.urgent_ns: %d \n"
2008 "a.cstate_enter_plus_exit: %d \n" 2008 "a.cstate_enter_plus_exit: %d \n"
@@ -2025,7 +2025,7 @@ static void dcn10_apply_ctx_for_surface(
2025 context->bw.dcn.watermarks.b.cstate_pstate.pstate_change_ns, 2025 context->bw.dcn.watermarks.b.cstate_pstate.pstate_change_ns,
2026 context->bw.dcn.watermarks.b.pte_meta_urgent_ns 2026 context->bw.dcn.watermarks.b.pte_meta_urgent_ns
2027 ); 2027 );
2028 dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS, 2028 DC_LOG_BANDWIDTH_CALCS(dc->ctx->logger,
2029 "\nc.urgent_ns: %d \n" 2029 "\nc.urgent_ns: %d \n"
2030 "c.cstate_enter_plus_exit: %d \n" 2030 "c.cstate_enter_plus_exit: %d \n"
2031 "c.cstate_exit: %d \n" 2031 "c.cstate_exit: %d \n"
@@ -2268,7 +2268,7 @@ static void dcn10_wait_for_mpcc_disconnect(
2268 res_pool->mpc->funcs->wait_for_idle(res_pool->mpc, mpcc_inst); 2268 res_pool->mpc->funcs->wait_for_idle(res_pool->mpc, mpcc_inst);
2269 pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst] = false; 2269 pipe_ctx->stream_res.opp->mpcc_disconnect_pending[mpcc_inst] = false;
2270 hubp->funcs->set_blank(hubp, true); 2270 hubp->funcs->set_blank(hubp, true);
2271 /*dm_logger_write(dc->ctx->logger, LOG_ERROR, 2271 /*DC_LOG_ERROR(dc->ctx->logger,
2272 "[debug_mpo: wait_for_mpcc finished waiting on mpcc %d]\n", 2272 "[debug_mpo: wait_for_mpcc finished waiting on mpcc %d]\n",
2273 i);*/ 2273 i);*/
2274 } 2274 }
diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c b/drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c
index 9c42fe5a0f27..eacc9ebd6933 100644
--- a/drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c
+++ b/drivers/gpu/drm/amd/display/dc/i2caux/aux_engine.c
@@ -274,7 +274,7 @@ static bool read_command(
274 274
275 if (request->payload.address_space == 275 if (request->payload.address_space ==
276 I2CAUX_TRANSACTION_ADDRESS_SPACE_DPCD) { 276 I2CAUX_TRANSACTION_ADDRESS_SPACE_DPCD) {
277 dm_logger_write(engine->base.ctx->logger, LOG_I2C_AUX, "READ: addr:0x%x value:0x%x Result:%d", 277 DC_LOG_I2C_AUX(engine->base.ctx->logger, "READ: addr:0x%x value:0x%x Result:%d",
278 request->payload.address, 278 request->payload.address,
279 request->payload.data[0], 279 request->payload.data[0],
280 ctx.operation_succeeded); 280 ctx.operation_succeeded);
@@ -483,7 +483,7 @@ static bool write_command(
483 483
484 if (request->payload.address_space == 484 if (request->payload.address_space ==
485 I2CAUX_TRANSACTION_ADDRESS_SPACE_DPCD) { 485 I2CAUX_TRANSACTION_ADDRESS_SPACE_DPCD) {
486 dm_logger_write(engine->base.ctx->logger, LOG_I2C_AUX, "WRITE: addr:0x%x value:0x%x Result:%d", 486 DC_LOG_I2C_AUX(engine->base.ctx->logger, "WRITE: addr:0x%x value:0x%x Result:%d",
487 request->payload.address, 487 request->payload.address,
488 request->payload.data[0], 488 request->payload.data[0],
489 ctx.operation_succeeded); 489 ctx.operation_succeeded);
diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c b/drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c
index 56e25b3d65fd..ad685b1c9b81 100644
--- a/drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c
+++ b/drivers/gpu/drm/amd/display/dc/i2caux/dce110/i2c_hw_engine_dce110.c
@@ -525,8 +525,8 @@ static void construct(
525 REG_GET(MICROSECOND_TIME_BASE_DIV, XTAL_REF_DIV, &xtal_ref_div); 525 REG_GET(MICROSECOND_TIME_BASE_DIV, XTAL_REF_DIV, &xtal_ref_div);
526 526
527 if (xtal_ref_div == 0) { 527 if (xtal_ref_div == 0) {
528 dm_logger_write( 528 DC_LOG_WARNING(
529 hw_engine->base.base.base.ctx->logger, LOG_WARNING, 529 hw_engine->base.base.base.ctx->logger,
530 "Invalid base timer divider\n", 530 "Invalid base timer divider\n",
531 __func__); 531 __func__);
532 xtal_ref_div = 2; 532 xtal_ref_div = 2;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
index f7e40b292dfb..e3de56b7ac5f 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
@@ -181,8 +181,8 @@ bool dal_irq_service_dummy_set(
181 const struct irq_source_info *info, 181 const struct irq_source_info *info,
182 bool enable) 182 bool enable)
183{ 183{
184 dm_logger_write( 184 DC_LOG_ERROR(
185 irq_service->ctx->logger, LOG_ERROR, 185 irq_service->ctx->logger,
186 "%s: called for non-implemented irq source\n", 186 "%s: called for non-implemented irq source\n",
187 __func__); 187 __func__);
188 return false; 188 return false;
@@ -192,8 +192,8 @@ bool dal_irq_service_dummy_ack(
192 struct irq_service *irq_service, 192 struct irq_service *irq_service,
193 const struct irq_source_info *info) 193 const struct irq_source_info *info)
194{ 194{
195 dm_logger_write( 195 DC_LOG_ERROR(
196 irq_service->ctx->logger, LOG_ERROR, 196 irq_service->ctx->logger,
197 "%s: called for non-implemented irq source\n", 197 "%s: called for non-implemented irq source\n",
198 __func__); 198 __func__);
199 return false; 199 return false;
diff --git a/drivers/gpu/drm/amd/display/dc/irq/irq_service.c b/drivers/gpu/drm/amd/display/dc/irq/irq_service.c
index b106513fc2dc..441724776441 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/irq_service.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/irq_service.c
@@ -104,8 +104,8 @@ bool dal_irq_service_set(
104 find_irq_source_info(irq_service, source); 104 find_irq_source_info(irq_service, source);
105 105
106 if (!info) { 106 if (!info) {
107 dm_logger_write( 107 DC_LOG_ERROR(
108 irq_service->ctx->logger, LOG_ERROR, 108 irq_service->ctx->logger,
109 "%s: cannot find irq info table entry for %d\n", 109 "%s: cannot find irq info table entry for %d\n",
110 __func__, 110 __func__,
111 source); 111 source);
@@ -142,8 +142,8 @@ bool dal_irq_service_ack(
142 find_irq_source_info(irq_service, source); 142 find_irq_source_info(irq_service, source);
143 143
144 if (!info) { 144 if (!info) {
145 dm_logger_write( 145 DC_LOG_ERROR(
146 irq_service->ctx->logger, LOG_ERROR, 146 irq_service->ctx->logger,
147 "%s: cannot find irq info table entry for %d\n", 147 "%s: cannot find irq info table entry for %d\n",
148 __func__, 148 __func__,
149 source); 149 source);
diff --git a/drivers/gpu/drm/amd/display/include/logger_types.h b/drivers/gpu/drm/amd/display/include/logger_types.h
index e2ff8cd423d6..65b6bf892839 100644
--- a/drivers/gpu/drm/amd/display/include/logger_types.h
+++ b/drivers/gpu/drm/amd/display/include/logger_types.h
@@ -29,6 +29,39 @@
29#include "os_types.h" 29#include "os_types.h"
30 30
31#define MAX_NAME_LEN 32 31#define MAX_NAME_LEN 32
32#define DC_LOG_ERROR(a, b, ...) dm_logger_write(a, LOG_ERROR, b, ## __VA_ARGS__)
33#define DC_LOG_WARNING(a, b, ...) dm_logger_write(a, LOG_WARNING, b, ## __VA_ARGS__)
34#define DC_LOG_DEBUG(a, b, ...) dm_logger_write(a, LOG_DEBUG, b, ## __VA_ARGS__)
35#define DC_LOG_DC(a, b, ...) dm_logger_write(a, LOG_DC, b, ## __VA_ARGS__)
36#define DC_LOG_DTN(a, b, ...) dm_logger_write(a, LOG_DTN, b, ## __VA_ARGS__)
37#define DC_LOG_SURFACE(a, b, ...) dm_logger_write(a, LOG_SURFACE, b, ## __VA_ARGS__)
38#define DC_LOG_HW_HOTPLUG(a, b, ...) dm_logger_write(a, LOG_HW_HOTPLUG, b, ## __VA_ARGS__)
39#define DC_LOG_HW_LINK_TRAINING(a, b, ...) dm_logger_write(a, LOG_HW_LINK_TRAINING, b, ## __VA_ARGS__)
40#define DC_LOG_HW_SET_MODE(a, b, ...) dm_logger_write(a, LOG_HW_SET_MODE, b, ## __VA_ARGS__)
41#define DC_LOG_HW_RESUME_S3(a, b, ...) dm_logger_write(a, LOG_HW_RESUME_S3, b, ## __VA_ARGS__)
42#define DC_LOG_HW_AUDIO(a, b, ...) dm_logger_write(a, LOG_HW_AUDIO, b, ## __VA_ARGS__)
43#define DC_LOG_HW_HPD_IRQ(a, b, ...) dm_logger_write(a, LOG_HW_HPD_IRQ, b, ## __VA_ARGS__)
44#define DC_LOG_MST(a, b, ...) dm_logger_write(a, LOG_MST, b, ## __VA_ARGS__)
45#define DC_LOG_SCALER(a, b, ...) dm_logger_write(a, LOG_SCALER, b, ## __VA_ARGS__)
46#define DC_LOG_BIOS(a, b, ...) dm_logger_write(a, LOG_BIOS, b, ## __VA_ARGS__)
47#define DC_LOG_BANDWIDTH_CALCS(a, b, ...) dm_logger_write(a, LOG_BANDWIDTH_CALCS, b, ## __VA_ARGS__)
48#define DC_LOG_BANDWIDTH_VALIDATION(a, b, ...) dm_logger_write(a, LOG_BANDWIDTH_VALIDATION, b, ## __VA_ARGS__)
49#define DC_LOG_I2C_AUX(a, b, ...) dm_logger_write(a, LOG_I2C_AUX, b, ## __VA_ARGS__)
50#define DC_LOG_SYNC(a, b, ...) dm_logger_write(a, LOG_SYNC, b, ## __VA_ARGS__)
51#define DC_LOG_BACKLIGHT(a, b, ...) dm_logger_write(a, LOG_BACKLIGHT, b, ## __VA_ARGS__)
52#define DC_LOG_FEATURE_OVERRIDE(a, b, ...) dm_logger_write(a, LOG_FEATURE_OVERRIDE, b, ## __VA_ARGS__)
53#define DC_LOG_DETECTION_EDID_PARSER(a, b, ...) dm_logger_write(a, LOG_DETECTION_EDID_PARSER, b, ## __VA_ARGS__)
54#define DC_LOG_DETECTION_DP_CAPS(a, b, ...) dm_logger_write(a, LOG_DETECTION_DP_CAPS, b, ## __VA_ARGS__)
55#define DC_LOG_RESOURCE(a, b, ...) dm_logger_write(a, LOG_RESOURCE, b, ## __VA_ARGS__)
56#define DC_LOG_DML(a, b, ...) dm_logger_write(a, LOG_DML, b, ## __VA_ARGS__)
57#define DC_LOG_EVENT_MODE_SET(a, b, ...) dm_logger_write(a, LOG_EVENT_MODE_SET, b, ## __VA_ARGS__)
58#define DC_LOG_EVENT_DETECTION(a, b, ...) dm_logger_write(a, LOG_EVENT_DETECTION, b, ## __VA_ARGS__)
59#define DC_LOG_EVENT_LINK_TRAINING(a, b, ...) dm_logger_write(a, LOG_EVENT_LINK_TRAINING, b, ## __VA_ARGS__)
60#define DC_LOG_EVENT_LINK_LOSS(a, b, ...) dm_logger_write(a, LOG_EVENT_LINK_LOSS, b, ## __VA_ARGS__)
61#define DC_LOG_EVENT_UNDERFLOW(a, b, ...) dm_logger_write(a, LOG_EVENT_UNDERFLOW, b, ## __VA_ARGS__)
62#define DC_LOG_IF_TRACE(a, b, ...) dm_logger_write(a, LOG_IF_TRACE, b, ## __VA_ARGS__)
63#define DC_LOG_PERF_TRACE(a, b, ...) dm_logger_write(a, LOG_PERF_TRACE, b, ## __VA_ARGS__)
64
32 65
33struct dal_logger; 66struct dal_logger;
34 67