drm/i915: Use DRM_MODE_FMT+DRM_MODE_ARG()

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ä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220323182935.4701-3-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index c7afe19dd44acfb9f913fb8bef9e5ac376279020..3f3e8ccd902656e52299e58315dc44572f187649 100644 (file)
--- 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(&i915->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(&i915->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(&i915->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 24e76afb050d7cf6eb5534fd6ade2a0cd11b0cdc..84501d00653ac39cfc2a30a0624c3a64dfe2c6cb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5421,13 +5421,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(&dev_priv->drm, "requested mode:\n");
-       drm_mode_debug_printmodeline(&pipe_config->hw.mode);
-       drm_dbg_kms(&dev_priv->drm, "adjusted mode:\n");
-       drm_mode_debug_printmodeline(&pipe_config->hw.adjusted_mode);
+       drm_dbg_kms(&dev_priv->drm, "requested mode: " DRM_MODE_FMT "\n",
+                   DRM_MODE_ARG(&pipe_config->hw.mode));
+       drm_dbg_kms(&dev_priv->drm, "adjusted mode: " DRM_MODE_FMT "\n",
+                   DRM_MODE_ARG(&pipe_config->hw.adjusted_mode));
        intel_dump_crtc_timings(dev_priv, &pipe_config->hw.adjusted_mode);
-       drm_dbg_kms(&dev_priv->drm, "pipe mode:\n");
-       drm_mode_debug_printmodeline(&pipe_config->hw.pipe_mode);
+       drm_dbg_kms(&dev_priv->drm, "pipe mode: " DRM_MODE_FMT "\n",
+                   DRM_MODE_ARG(&pipe_config->hw.pipe_mode));
        intel_dump_crtc_timings(dev_priv, &pipe_config->hw.pipe_mode);
        drm_dbg_kms(&dev_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 cfe88c4cfa29bfbf3a626a694d46445acf85ad6c..595e34fdd1e08bf6c8fa9469521048d25a769db8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2553,9 +2553,9 @@ static void intel_edp_mso_mode_fixup(struct intel_connector *connector,
        drm_mode_set_name(mode);
 
        drm_dbg_kms(&i915->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 d4dc16a9c0dd363c856c55684760a8747c383888..90e026cef6ee19f58d46ea02908c5532e7463ba7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dvo.c
+++ b/drivers/gpu/drm/i915/display/intel_dvo.c
@@ -391,8 +391,8 @@ intel_dvo_get_current_mode(struct intel_encoder *encoder)
 
        mode = intel_encoder_current_mode(encoder);
        if (mode) {
-               DRM_DEBUG_KMS("using current (BIOS) mode: ");
-               drm_mode_debug_printmodeline(mode);
+               DRM_DEBUG_KMS("using current (BIOS) mode: " DRM_MODE_FMT "\n",
+                             DRM_MODE_ARG(mode));
                mode->type |= DRM_MODE_TYPE_PREFERRED;
        }
 

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index cd685dbf324ba83fd073298ae59ca3b7ee1a6d13..b57e76b4ef04a35ace2dfe07efeebdffbad63d0e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -984,8 +984,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
         */
        fixed_mode = intel_encoder_current_mode(intel_encoder);
        if (fixed_mode) {
-               drm_dbg_kms(&dev_priv->drm, "using current (BIOS) mode: ");
-               drm_mode_debug_printmodeline(fixed_mode);
+               drm_dbg_kms(&dev_priv->drm, "using current (BIOS) mode: " DRM_MODE_FMT "\n",
+                           DRM_MODE_ARG(fixed_mode));
                fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
        }
 

diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
index 8c9e26539cc583cccc6df4ed4340a0cd76ce7392..2ba51222d1564a982b262339e7072a4558d87592 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_panel.c
+++ b/drivers/gpu/drm/i915/display/intel_panel.c
@@ -194,9 +194,9 @@ intel_panel_edid_downclock_mode(struct intel_connector *connector,
                return NULL;
 
        drm_dbg_kms(&dev_priv->drm,
-                   "[CONNECTOR:%d:%s] using downclock mode from EDID: ",
-                   connector->base.base.id, connector->base.name);
-       drm_mode_debug_printmodeline(downclock_mode);
+                   "[CONNECTOR:%d:%s] using downclock mode from EDID: " DRM_MODE_FMT "\n",
+                   connector->base.base.id, connector->base.name,
+                   DRM_MODE_ARG(downclock_mode));
 
        return downclock_mode;
 }
@@ -221,9 +221,9 @@ intel_panel_edid_fixed_mode(struct intel_connector *connector)
                        return NULL;
 
                drm_dbg_kms(&dev_priv->drm,
-                           "[CONNECTOR:%d:%s] using preferred mode from EDID: ",
-                           connector->base.base.id, connector->base.name);
-               drm_mode_debug_printmodeline(fixed_mode);
+                           "[CONNECTOR:%d:%s] using preferred mode from EDID: " DRM_MODE_FMT "\n",
+                           connector->base.base.id, connector->base.name,
+                           DRM_MODE_ARG(fixed_mode));
 
                return fixed_mode;
        }
@@ -238,9 +238,9 @@ intel_panel_edid_fixed_mode(struct intel_connector *connector)
        fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
 
        drm_dbg_kms(&dev_priv->drm,
-                   "[CONNECTOR:%d:%s] using first mode from EDID: ",
-                   connector->base.base.id, connector->base.name);
-       drm_mode_debug_printmodeline(fixed_mode);
+                   "[CONNECTOR:%d:%s] using first mode from EDID: " DRM_MODE_FMT "\n",
+                   connector->base.base.id, connector->base.name,
+                   DRM_MODE_ARG(fixed_mode));
 
        return fixed_mode;
 }
@@ -262,9 +262,9 @@ intel_panel_vbt_fixed_mode(struct intel_connector *connector)
 
        fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
 
-       drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s] using mode from VBT: ",
-                   connector->base.base.id, connector->base.name);
-       drm_mode_debug_printmodeline(fixed_mode);
+       drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s] using mode from VBT: " DRM_MODE_FMT "\n",
+                   connector->base.base.id, connector->base.name,
+                   DRM_MODE_ARG(fixed_mode));
 
        info->width_mm = fixed_mode->width_mm;
        info->height_mm = fixed_mode->height_mm;

diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index 8a39989b87ad9f6ccc792b85ed3304e931675b0d..9379f3463344b6e14e3da07f16dd0ff48811885c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -1145,8 +1145,8 @@ intel_tv_get_config(struct intel_encoder *encoder,
 
        intel_tv_mode_to_mode(&mode, &tv_mode);
 
-       drm_dbg_kms(&dev_priv->drm, "TV mode:\n");
-       drm_mode_debug_printmodeline(&mode);
+       drm_dbg_kms(&dev_priv->drm, "TV mode: " DRM_MODE_FMT "\n",
+                   DRM_MODE_ARG(&mode));
 
        intel_tv_scale_mode_horiz(&mode, hdisplay,
                                  xpos, mode.hdisplay - xsize - xpos);
@@ -1250,8 +1250,8 @@ intel_tv_compute_config(struct intel_encoder *encoder,
                tv_conn_state->bypass_vfilter = false;
        }
 
-       drm_dbg_kms(&dev_priv->drm, "TV mode:\n");
-       drm_mode_debug_printmodeline(adjusted_mode);
+       drm_dbg_kms(&dev_priv->drm, "TV mode: " DRM_MODE_FMT "\n",
+                   DRM_MODE_ARG(adjusted_mode));
 
        /*
         * The pipe scanline counter behaviour looks as follows when
@@ -1806,8 +1806,8 @@ intel_tv_get_modes(struct drm_connector *connector)
                 */
                intel_tv_mode_to_mode(mode, tv_mode);
                if (count == 0) {
-                       drm_dbg_kms(&dev_priv->drm, "TV mode:\n");
-                       drm_mode_debug_printmodeline(mode);
+                       drm_dbg_kms(&dev_priv->drm, "TV mode: " DRM_MODE_FMT "\n",
+                                   DRM_MODE_ARG(mode));
                }
                intel_tv_scale_mode_horiz(mode, input->w, 0, 0);
                intel_tv_scale_mode_vert(mode, input->h, 0, 0);