Re: [Intel-gfx] [PATCH 2/9] drm/i915: Use DRM_MODE_FMT+DRM_MODE_ARG()
On Wed, 23 Mar 2022, Ville Syrjala wrote: > From: Ville Syrjälä > > Replace all drm_mode_debug_printmodeline() calls with > DRM_MODE_FMT+DRM_MODE_ARG(). Makes the debug output a bit more > terse in places where we previously had a newline in the precedeing > drm_dbg_kms(), and avoids anything else sneaking in between the two > printk()s in all cases. > > Signed-off-by: Ville Syrjälä Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_bios.c| 12 +- > drivers/gpu/drm/i915/display/intel_display.c | 12 +- > drivers/gpu/drm/i915/display/intel_dp.c | 6 ++--- > drivers/gpu/drm/i915/display/intel_dvo.c | 4 ++-- > drivers/gpu/drm/i915/display/intel_lvds.c| 4 ++-- > drivers/gpu/drm/i915/display/intel_panel.c | 24 ++-- > drivers/gpu/drm/i915/display/intel_tv.c | 12 +- > 7 files changed, 37 insertions(+), 37 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c > b/drivers/gpu/drm/i915/display/intel_bios.c > index c7afe19dd44a..3f3e8ccd9026 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -306,8 +306,8 @@ parse_lfp_panel_dtd(struct drm_i915_private *i915, > i915->vbt.lfp_lvds_vbt_mode = panel_fixed_mode; > > drm_dbg_kms(>drm, > - "Found panel mode in BIOS VBT legacy lfp table:\n"); > - drm_mode_debug_printmodeline(panel_fixed_mode); > + "Found panel mode in BIOS VBT legacy lfp table: " > DRM_MODE_FMT "\n", > + DRM_MODE_ARG(panel_fixed_mode)); > > fp_timing = get_lvds_fp_timing(bdb, lvds_lfp_data, > lvds_lfp_data_ptrs, > @@ -397,8 +397,8 @@ parse_generic_dtd(struct drm_i915_private *i915, > panel_fixed_mode->flags |= DRM_MODE_FLAG_NVSYNC; > > drm_dbg_kms(>drm, > - "Found panel mode in BIOS VBT generic dtd table:\n"); > - drm_mode_debug_printmodeline(panel_fixed_mode); > + "Found panel mode in BIOS VBT generic dtd table: " > DRM_MODE_FMT "\n", > + DRM_MODE_ARG(panel_fixed_mode)); > > i915->vbt.lfp_lvds_vbt_mode = panel_fixed_mode; > } > @@ -551,8 +551,8 @@ parse_sdvo_panel_data(struct drm_i915_private *i915, > i915->vbt.sdvo_lvds_vbt_mode = panel_fixed_mode; > > drm_dbg_kms(>drm, > - "Found SDVO panel mode in BIOS VBT tables:\n"); > - drm_mode_debug_printmodeline(panel_fixed_mode); > + "Found SDVO panel mode in BIOS VBT tables: " DRM_MODE_FMT > "\n", > + DRM_MODE_ARG(panel_fixed_mode)); > } > > static int intel_bios_ssc_frequency(struct drm_i915_private *i915, > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index dc6e21e4ef0b..ff50b4bc2b3d 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -5417,13 +5417,13 @@ static void intel_dump_pipe_config(const struct > intel_crtc_state *pipe_config, > intel_vrr_vmin_vblank_start(pipe_config), > intel_vrr_vmax_vblank_start(pipe_config)); > > - drm_dbg_kms(_priv->drm, "requested mode:\n"); > - drm_mode_debug_printmodeline(_config->hw.mode); > - drm_dbg_kms(_priv->drm, "adjusted mode:\n"); > - drm_mode_debug_printmodeline(_config->hw.adjusted_mode); > + drm_dbg_kms(_priv->drm, "requested mode: " DRM_MODE_FMT "\n", > + DRM_MODE_ARG(_config->hw.mode)); > + drm_dbg_kms(_priv->drm, "adjusted mode: " DRM_MODE_FMT "\n", > + DRM_MODE_ARG(_config->hw.adjusted_mode)); > intel_dump_crtc_timings(dev_priv, _config->hw.adjusted_mode); > - drm_dbg_kms(_priv->drm, "pipe mode:\n"); > - drm_mode_debug_printmodeline(_config->hw.pipe_mode); > + drm_dbg_kms(_priv->drm, "pipe mode: " DRM_MODE_FMT "\n", > + DRM_MODE_ARG(_config->hw.pipe_mode)); > intel_dump_crtc_timings(dev_priv, _config->hw.pipe_mode); > drm_dbg_kms(_priv->drm, > "port clock: %d, pipe src: " DRM_RECT_FMT ", pixel rate > %d\n", > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 3bf44f7909e5..f54088db9862 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2579,9 +2579,9 @@ static void intel_edp_mso_mode_fixup(struct > intel_connector *connector, > drm_mode_set_name(mode); > > drm_dbg_kms(>drm, > - "[CONNECTOR:%d:%s] using generated MSO mode: ", > - connector->base.base.id, connector->base.name); > - drm_mode_debug_printmodeline(mode); > + "[CONNECTOR:%d:%s] using generated MSO mode: " DRM_MODE_FMT > "\n", > + connector->base.base.id, connector->base.name, > + DRM_MODE_ARG(mode)); > } > > static void
[Intel-gfx] [PATCH 2/9] drm/i915: Use DRM_MODE_FMT+DRM_MODE_ARG()
From: Ville Syrjälä Replace all drm_mode_debug_printmodeline() calls with DRM_MODE_FMT+DRM_MODE_ARG(). Makes the debug output a bit more terse in places where we previously had a newline in the precedeing drm_dbg_kms(), and avoids anything else sneaking in between the two printk()s in all cases. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_bios.c| 12 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- drivers/gpu/drm/i915/display/intel_dp.c | 6 ++--- drivers/gpu/drm/i915/display/intel_dvo.c | 4 ++-- drivers/gpu/drm/i915/display/intel_lvds.c| 4 ++-- drivers/gpu/drm/i915/display/intel_panel.c | 24 ++-- drivers/gpu/drm/i915/display/intel_tv.c | 12 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index c7afe19dd44a..3f3e8ccd9026 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -306,8 +306,8 @@ parse_lfp_panel_dtd(struct drm_i915_private *i915, i915->vbt.lfp_lvds_vbt_mode = panel_fixed_mode; drm_dbg_kms(>drm, - "Found panel mode in BIOS VBT legacy lfp table:\n"); - drm_mode_debug_printmodeline(panel_fixed_mode); + "Found panel mode in BIOS VBT legacy lfp table: " DRM_MODE_FMT "\n", + DRM_MODE_ARG(panel_fixed_mode)); fp_timing = get_lvds_fp_timing(bdb, lvds_lfp_data, lvds_lfp_data_ptrs, @@ -397,8 +397,8 @@ parse_generic_dtd(struct drm_i915_private *i915, panel_fixed_mode->flags |= DRM_MODE_FLAG_NVSYNC; drm_dbg_kms(>drm, - "Found panel mode in BIOS VBT generic dtd table:\n"); - drm_mode_debug_printmodeline(panel_fixed_mode); + "Found panel mode in BIOS VBT generic dtd table: " DRM_MODE_FMT "\n", + DRM_MODE_ARG(panel_fixed_mode)); i915->vbt.lfp_lvds_vbt_mode = panel_fixed_mode; } @@ -551,8 +551,8 @@ parse_sdvo_panel_data(struct drm_i915_private *i915, i915->vbt.sdvo_lvds_vbt_mode = panel_fixed_mode; drm_dbg_kms(>drm, - "Found SDVO panel mode in BIOS VBT tables:\n"); - drm_mode_debug_printmodeline(panel_fixed_mode); + "Found SDVO panel mode in BIOS VBT tables: " DRM_MODE_FMT "\n", + DRM_MODE_ARG(panel_fixed_mode)); } static int intel_bios_ssc_frequency(struct drm_i915_private *i915, diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index dc6e21e4ef0b..ff50b4bc2b3d 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5417,13 +5417,13 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config, intel_vrr_vmin_vblank_start(pipe_config), intel_vrr_vmax_vblank_start(pipe_config)); - drm_dbg_kms(_priv->drm, "requested mode:\n"); - drm_mode_debug_printmodeline(_config->hw.mode); - drm_dbg_kms(_priv->drm, "adjusted mode:\n"); - drm_mode_debug_printmodeline(_config->hw.adjusted_mode); + drm_dbg_kms(_priv->drm, "requested mode: " DRM_MODE_FMT "\n", + DRM_MODE_ARG(_config->hw.mode)); + drm_dbg_kms(_priv->drm, "adjusted mode: " DRM_MODE_FMT "\n", + DRM_MODE_ARG(_config->hw.adjusted_mode)); intel_dump_crtc_timings(dev_priv, _config->hw.adjusted_mode); - drm_dbg_kms(_priv->drm, "pipe mode:\n"); - drm_mode_debug_printmodeline(_config->hw.pipe_mode); + drm_dbg_kms(_priv->drm, "pipe mode: " DRM_MODE_FMT "\n", + DRM_MODE_ARG(_config->hw.pipe_mode)); intel_dump_crtc_timings(dev_priv, _config->hw.pipe_mode); drm_dbg_kms(_priv->drm, "port clock: %d, pipe src: " DRM_RECT_FMT ", pixel rate %d\n", diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 3bf44f7909e5..f54088db9862 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2579,9 +2579,9 @@ static void intel_edp_mso_mode_fixup(struct intel_connector *connector, drm_mode_set_name(mode); drm_dbg_kms(>drm, - "[CONNECTOR:%d:%s] using generated MSO mode: ", - connector->base.base.id, connector->base.name); - drm_mode_debug_printmodeline(mode); + "[CONNECTOR:%d:%s] using generated MSO mode: " DRM_MODE_FMT "\n", + connector->base.base.id, connector->base.name, + DRM_MODE_ARG(mode)); } static void intel_edp_mso_init(struct intel_dp *intel_dp) diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c index d4dc16a9c0dd..90e026cef6ee 100644 ---
