drm/i915: Compact a few pipe config debug lines

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6afee5053c0e91f1da9ad93d8f66dfed6482516b..330099a38877eb4ca25edab263e173027af529bd 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12739,8 +12739,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
        DRM_DEBUG_KMS("[CRTC:%d:%s]%s\n",
                      crtc->base.base.id, crtc->base.name, context);
 
-       DRM_DEBUG_KMS("cpu_transcoder: %s\n", transcoder_name(pipe_config->cpu_transcoder));
-       DRM_DEBUG_KMS("pipe bpp: %i, dithering: %i\n",
+       DRM_DEBUG_KMS("cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n",
+                     transcoder_name(pipe_config->cpu_transcoder),
                      pipe_config->pipe_bpp, pipe_config->dither);
 
        if (pipe_config->has_pch_encoder)
@@ -12757,16 +12757,15 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
        }
 
        DRM_DEBUG_KMS("audio: %i, infoframes: %i\n",
-                     pipe_config->has_audio,
-                     pipe_config->has_infoframe);
+                     pipe_config->has_audio, pipe_config->has_infoframe);
 
        DRM_DEBUG_KMS("requested mode:\n");
        drm_mode_debug_printmodeline(&pipe_config->base.mode);
        DRM_DEBUG_KMS("adjusted mode:\n");
        drm_mode_debug_printmodeline(&pipe_config->base.adjusted_mode);
        intel_dump_crtc_timings(&pipe_config->base.adjusted_mode);
-       DRM_DEBUG_KMS("port clock: %d\n", pipe_config->port_clock);
-       DRM_DEBUG_KMS("pipe src size: %dx%d\n",
+       DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n",
+                     pipe_config->port_clock,
                      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
        DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
                      crtc->num_scalers,
@@ -12780,8 +12779,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
                      pipe_config->pch_pfit.pos,
                      pipe_config->pch_pfit.size,
                      pipe_config->pch_pfit.enabled ? "enabled" : "disabled");
-       DRM_DEBUG_KMS("ips: %i\n", pipe_config->ips_enabled);
-       DRM_DEBUG_KMS("double wide: %i\n", pipe_config->double_wide);
+       DRM_DEBUG_KMS("ips: %i, double wide: %i\n",
+                     pipe_config->ips_enabled, pipe_config->double_wide);
 
        if (IS_BROXTON(dev_priv)) {
                DRM_DEBUG_KMS("dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x,"