Commit f01bae2d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220323182935.4701-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 5d2fd49d

drivers/gpu/drm/i915/display/intel_bios.c

+6 −6
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/display/intel_display.c

+6 −6
Original line number Diff line number Diff line
@@ -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",

drivers/gpu/drm/i915/display/intel_dp.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/display/intel_dvo.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/i915/display/intel_lvds.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}