--- initial
+++ final
@@ -1,54 +1,54 @@
 static void dce110_program_front_end_for_pipe(struct dc *dc, struct pipe_ctx *pipe_ctx) {
   struct mem_input *mi = pipe_ctx->plane_res.mi;
   struct pipe_ctx *old_pipe = NULL;
   struct dc_plane_state *plane_state = pipe_ctx->plane_state;
   struct xfm_grph_csc_adjustment adjust;
   struct out_csc_color_matrix tbl_entry;
   unsigned int i;
   memset(&tbl_entry, 0, sizeof(tbl_entry));
   if (dc->current_state) old_pipe = &dc->current_state->res_ctx.pipe_ctx[pipe_ctx->pipe_idx];
   memset(&adjust, 0, sizeof(adjust));
   adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_BYPASS;
   dce_enable_fe_clock(dc->hwseq, mi->inst, true);
   set_default_colors(pipe_ctx);
   if (pipe_ctx->stream->csc_color_matrix.enable_adjustment == true) {
     tbl_entry.color_space = pipe_ctx->stream->output_color_space;
     for (i = 0; i < 12; i++)
       tbl_entry.regval[i] = pipe_ctx->stream->csc_color_matrix.matrix[i];
     pipe_ctx->plane_res.xfm->funcs->opp_set_csc_adjustment(pipe_ctx->plane_res.xfm, &tbl_entry);
   }
   if (pipe_ctx->stream->gamut_remap_matrix.enable_remap == true) {
     adjust.gamut_adjust_type = GRAPHICS_GAMUT_ADJUST_TYPE_SW;
     for (i = 0; i < CSC_TEMPERATURE_MATRIX_SIZE; i++)
       adjust.temperature_matrix[i] = pipe_ctx->stream->gamut_remap_matrix.matrix[i];
   }
   pipe_ctx->plane_res.xfm->funcs->transform_set_gamut_remap(pipe_ctx->plane_res.xfm, &adjust);
   pipe_ctx->plane_res.scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0;
   program_scaler(dc, pipe_ctx);
 #if defined(CONFIG_DRM_AMD_DC_FBC)
   if (dc->fbc_compressor && old_pipe->stream) {
     if (plane_state->tiling_info.gfx8.array_mode == DC_ARRAY_LINEAR_GENERAL)
       dc->fbc_compressor->funcs->disable_fbc(dc->fbc_compressor);
     else
       enable_fbc(dc, dc->current_state);
   }
 #endif
   mi->funcs->mem_input_program_surface_config(mi, plane_state->format, &plane_state->tiling_info, &plane_state->plane_size, plane_state->rotation, NULL, false);
   if (mi->funcs->set_blank) mi->funcs->set_blank(mi, pipe_ctx->plane_state->visible);
   if (dc->config.gpu_vm_support) mi->funcs->mem_input_program_pte_vm(pipe_ctx->plane_res.mi, plane_state->format, &plane_state->tiling_info, plane_state->rotation);
   /* Moved programming gamma from dc to hwss */
   if (pipe_ctx->plane_state->update_flags.bits.full_update || pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change || pipe_ctx->plane_state->update_flags.bits.gamma_change) dc->hwss.set_input_transfer_func(pipe_ctx, pipe_ctx->plane_state);
   if (pipe_ctx->plane_state->update_flags.bits.full_update) dc->hwss.set_output_transfer_func(pipe_ctx, pipe_ctx->stream);
-  dm_logger_write(dc->ctx->logger, LOG_SURFACE,
-                  "Pipe:%d 0x%x: addr hi:0x%x, "
-                  "addr low:0x%x, "
-                  "src: %d, %d, %d,"
-                  " %d; dst: %d, %d, %d, %d;"
-                  "clip: %d, %d, %d, %d\n",
-                  pipe_ctx->pipe_idx, pipe_ctx->plane_state, pipe_ctx->plane_state->address.grph.addr.high_part, pipe_ctx->plane_state->address.grph.addr.low_part, pipe_ctx->plane_state->src_rect.x, pipe_ctx->plane_state->src_rect.y, pipe_ctx->plane_state->src_rect.width, pipe_ctx->plane_state->src_rect.height, pipe_ctx->plane_state->dst_rect.x, pipe_ctx->plane_state->dst_rect.y, pipe_ctx->plane_state->dst_rect.width, pipe_ctx->plane_state->dst_rect.height, pipe_ctx->plane_state->clip_rect.x, pipe_ctx->plane_state->clip_rect.y, pipe_ctx->plane_state->clip_rect.width, pipe_ctx->plane_state->clip_rect.height);
-  dm_logger_write(dc->ctx->logger, LOG_SURFACE,
-                  "Pipe %d: width, height, x, y\n"
-                  "viewport:%d, %d, %d, %d\n"
-                  "recout:  %d, %d, %d, %d\n",
-                  pipe_ctx->pipe_idx, pipe_ctx->plane_res.scl_data.viewport.width, pipe_ctx->plane_res.scl_data.viewport.height, pipe_ctx->plane_res.scl_data.viewport.x, pipe_ctx->plane_res.scl_data.viewport.y, pipe_ctx->plane_res.scl_data.recout.width, pipe_ctx->plane_res.scl_data.recout.height, pipe_ctx->plane_res.scl_data.recout.x, pipe_ctx->plane_res.scl_data.recout.y);
+  DC_LOG_SURFACE(dc->ctx->logger,
+                 "Pipe:%d 0x%x: addr hi:0x%x, "
+                 "addr low:0x%x, "
+                 "src: %d, %d, %d,"
+                 " %d; dst: %d, %d, %d, %d;"
+                 "clip: %d, %d, %d, %d\n",
+                 pipe_ctx->pipe_idx, pipe_ctx->plane_state, pipe_ctx->plane_state->address.grph.addr.high_part, pipe_ctx->plane_state->address.grph.addr.low_part, pipe_ctx->plane_state->src_rect.x, pipe_ctx->plane_state->src_rect.y, pipe_ctx->plane_state->src_rect.width, pipe_ctx->plane_state->src_rect.height, pipe_ctx->plane_state->dst_rect.x, pipe_ctx->plane_state->dst_rect.y, pipe_ctx->plane_state->dst_rect.width, pipe_ctx->plane_state->dst_rect.height, pipe_ctx->plane_state->clip_rect.x, pipe_ctx->plane_state->clip_rect.y, pipe_ctx->plane_state->clip_rect.width, pipe_ctx->plane_state->clip_rect.height);
+  DC_LOG_SURFACE(dc->ctx->logger,
+                 "Pipe %d: width, height, x, y\n"
+                 "viewport:%d, %d, %d, %d\n"
+                 "recout:  %d, %d, %d, %d\n",
+                 pipe_ctx->pipe_idx, pipe_ctx->plane_res.scl_data.viewport.width, pipe_ctx->plane_res.scl_data.viewport.height, pipe_ctx->plane_res.scl_data.viewport.x, pipe_ctx->plane_res.scl_data.viewport.y, pipe_ctx->plane_res.scl_data.recout.width, pipe_ctx->plane_res.scl_data.recout.height, pipe_ctx->plane_res.scl_data.recout.x, pipe_ctx->plane_res.scl_data.recout.y);
 }<sep>@@
expression e1;
@@

- dm_logger_write(e1,LOG_SURFACE,
+ DC_LOG_SURFACE(e1,
	...)