[4/9] drm/i915: Tidy planes and scaler info in intel_dump_pipe_config

Commit Message

Tvrtko Ursulin April 27, 2016, 10:06 a.m. UTC

From: Tvrtko Ursulin <[e-mail]>

1. Only log scaler data where scalers are supported for
   tidier logs.

2. Tidy plane data and fix logging prefix in the middle
   of a line.

Signed-off-by: Tvrtko Ursulin <[e-mail]>
---
 drivers/gpu/drm/i915/intel_display.c | 68 +++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 28 deletions(-)

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1362a1270c9f..6d63bc39777c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12130,6 +12130,7 @@  static void intel_dump_pipe_config(struct intel_crtc *crtc,
 				   const char *context)
 {
 	struct drm_device *dev = crtc->base.dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct drm_plane *plane;
 	struct intel_plane *intel_plane;
 	struct intel_plane_state *state;
@@ -12180,10 +12181,13 @@  static void intel_dump_pipe_config(struct intel_crtc *crtc,
 	DRM_DEBUG_KMS("port clock: %d\n", pipe_config->port_clock);
 	DRM_DEBUG_KMS("pipe src size: %dx%d\n",
 		      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,
-		      pipe_config->scaler_state.scaler_users,
-		      pipe_config->scaler_state.scaler_id);
+
+	if (INTEL_GEN(dev_priv) >= 9)
+		DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
+			      crtc->num_scalers,
+			      pipe_config->scaler_state.scaler_users,
+			      pipe_config->scaler_state.scaler_id);
+
 	DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n",
 		      pipe_config->gmch_pfit.control,
 		      pipe_config->gmch_pfit.pgm_ratios,
@@ -12232,7 +12236,7 @@  static void intel_dump_pipe_config(struct intel_crtc *crtc,
 			      pipe_config->dpll_hw_state.fp1);
 	}
 
-	DRM_DEBUG_KMS("planes on this crtc\n");
+	DRM_DEBUG_KMS("Planes on this crtc:\n");
 	list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
 		intel_plane = to_intel_plane(plane);
 		if (intel_plane->pipe != crtc->pipe)
@@ -12240,30 +12244,38 @@  static void intel_dump_pipe_config(struct intel_crtc *crtc,
 
 		state = to_intel_plane_state(plane->state);
 		fb = state->base.fb;
-		if (!fb) {
-			DRM_DEBUG_KMS("%s PLANE:%d plane: %u.%u idx: %d "
-				"disabled, scaler_id = %d\n",
-				plane->type == DRM_PLANE_TYPE_CURSOR ? "CURSOR" : "STANDARD",
-				plane->base.id, intel_plane->pipe,
-				(crtc->base.primary == plane) ? 0 : intel_plane->plane + 1,
-				drm_plane_index(plane), state->scaler_id);
-			continue;
-		}
 
-		DRM_DEBUG_KMS("%s PLANE:%d plane: %u.%u idx: %d enabled",
-			plane->type == DRM_PLANE_TYPE_CURSOR ? "CURSOR" : "STANDARD",
-			plane->base.id, intel_plane->pipe,
-			crtc->base.primary == plane ? 0 : intel_plane->plane + 1,
-			drm_plane_index(plane));
-		DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = 0x%x",
-			fb->base.id, fb->width, fb->height, fb->pixel_format);
-		DRM_DEBUG_KMS("\tscaler:%d src (%u, %u) %ux%u dst (%u, %u) %ux%u\n",
-			state->scaler_id,
-			state->src.x1 >> 16, state->src.y1 >> 16,
-			drm_rect_width(&state->src) >> 16,
-			drm_rect_height(&state->src) >> 16,
-			state->dst.x1, state->dst.y1,
-			drm_rect_width(&state->dst), drm_rect_height(&state->dst));
+		if (fb)
+			DRM_DEBUG_KMS("*");
+		else
+			DRM_DEBUG_KMS(" ");
+
+		if (drm_debug & DRM_UT_KMS)
+			printk("%s plane:%d (%u.%u) idx: %d",
+			       plane->type == DRM_PLANE_TYPE_CURSOR ?
+			       "cursor" : "standard",
+			       plane->base.id, intel_plane->pipe,
+			       crtc->base.primary == plane ?
+			       0 : intel_plane->plane + 1,
+			       drm_plane_index(plane));
+
+		if (fb && (drm_debug & DRM_UT_KMS))
+			printk(" fb:%d (%ux%u) format=0x%x",
+			       fb->base.id, fb->width, fb->height,
+			       fb->pixel_format);
+
+		if (INTEL_GEN(dev_priv) >= 9 && (drm_debug & DRM_UT_KMS))
+			printk(" scaler:%d src (%u, %u) %ux%u dst (%u, %u) %ux%u\n",
+			       state->scaler_id,
+			       state->src.x1 >> 16, state->src.y1 >> 16,
+			       drm_rect_width(&state->src) >> 16,
+			       drm_rect_height(&state->src) >> 16,
+			       state->dst.x1, state->dst.y1,
+			       drm_rect_width(&state->dst),
+			       drm_rect_height(&state->dst));
+
+		if (fb && (drm_debug & DRM_UT_KMS))
+			printk("\n");
 	}
 }