drm/i915: Include crtc_state.active in crtc state dumps

Currently we're not dumping out whether the crtc is actually
active or in dpms off state. Let's include that in the dumps.
And while at it compress out a few lines from the state dump.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190517193132.8140-11-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b7fc89986793ef66064fb230d852adb3b5586637..048cb8d7ae65ba1c824218560d85c5b48da7d386 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11810,10 +11810,9 @@ static void intel_dump_pipe_config(struct intel_crtc_state *pipe_config,
                      yesno(pipe_config->base.enable), context);
 
        snprintf_output_types(buf, sizeof(buf), pipe_config->output_types);
-       DRM_DEBUG_KMS("output_types: %s (0x%x)\n",
-                     buf, pipe_config->output_types);
-
-       DRM_DEBUG_KMS("output format: %s\n",
+       DRM_DEBUG_KMS("active: %s, output_types: %s (0x%x), output format: %s\n",
+                     yesno(pipe_config->base.active),
+                     buf, pipe_config->output_types,
                      output_formats(pipe_config->output_format));
 
        DRM_DEBUG_KMS("cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n",
@@ -11834,10 +11833,8 @@ static void intel_dump_pipe_config(struct intel_crtc_state *pipe_config,
                                              &pipe_config->dp_m2_n2);
        }
 
-       DRM_DEBUG_KMS("audio: %i, infoframes: %i\n",
-                     pipe_config->has_audio, pipe_config->has_infoframe);
-
-       DRM_DEBUG_KMS("infoframes enabled: 0x%x\n",
+       DRM_DEBUG_KMS("audio: %i, infoframes: %i, infoframes enabled: 0x%x\n",
+                     pipe_config->has_audio, pipe_config->has_infoframe,
                      pipe_config->infoframes.enable);
 
        if (pipe_config->infoframes.enable &