drm/i915: Improve staged config logging

Ander Conselvan de Oliveira · danvet · commit 10634189fc50 · 2015-03-17T22:29:54.000+01:00
When logging that full mode switch is necessary, log which connector,
encoder or crtc has caused it, so it is easier to figure out what is
goind on by just looking at the log.

Signed-off-by: Ander Conselvan de Oliveira &lt;ander.conselvan.de.oliveira@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
@@ -11504,7 +11504,9 @@ intel_modeset_stage_output_state(struct drm_device *dev,
 
 
 		if (&connector->new_encoder->base != connector->base.encoder) {
-			DRM_DEBUG_KMS("encoder changed, full mode switch\n");
+			DRM_DEBUG_KMS("[CONNECTOR:%d:%s] encoder changed, full mode switch\n",
+				      connector->base.base.id,
+				      connector->base.name);
 			config->mode_changed = true;
 		}
 	}
@@ -11555,7 +11557,9 @@ intel_modeset_stage_output_state(struct drm_device *dev,
 		/* Only now check for crtc changes so we don't miss encoders
 		 * that will be disabled. */
 		if (&encoder->new_crtc->base != encoder->base.crtc) {
-			DRM_DEBUG_KMS("crtc changed, full mode switch\n");
+			DRM_DEBUG_KMS("[ENCODER:%d:%s] crtc changed, full mode switch\n",
+				      encoder->base.base.id,
+				      encoder->base.name);
 			config->mode_changed = true;
 		}
 	}
@@ -11576,7 +11580,8 @@ intel_modeset_stage_output_state(struct drm_device *dev,
 		}
 
 		if (crtc->new_enabled != crtc->base.state->enable) {
-			DRM_DEBUG_KMS("crtc %sabled, full mode switch\n",
+			DRM_DEBUG_KMS("[CRTC:%d] %sabled, full mode switch\n",
+				      crtc->base.base.id,
 				      crtc->new_enabled ? "en" : "dis");
 			config->mode_changed = true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -11504,7 +11504,9 @@ intel_modeset_stage_output_state(struct drm_device *dev,`
`11504`	`11504`
`11505`	`11505`
`11506`	`11506`	`if (&connector->new_encoder->base != connector->base.encoder) {`
`11507`		`- DRM_DEBUG_KMS("encoder changed, full mode switch\n");`
	`11507`	`+ DRM_DEBUG_KMS("[CONNECTOR:%d:%s] encoder changed, full mode switch\n",`
	`11508`	`+ connector->base.base.id,`
	`11509`	`+ connector->base.name);`
`11508`	`11510`	`config->mode_changed = true;`
`11509`	`11511`	`}`
`11510`	`11512`	`}`
`@@ -11555,7 +11557,9 @@ intel_modeset_stage_output_state(struct drm_device *dev,`
`11555`	`11557`	`/* Only now check for crtc changes so we don't miss encoders`
`11556`	`11558`	`* that will be disabled. */`
`11557`	`11559`	`if (&encoder->new_crtc->base != encoder->base.crtc) {`
`11558`		`- DRM_DEBUG_KMS("crtc changed, full mode switch\n");`
	`11560`	`+ DRM_DEBUG_KMS("[ENCODER:%d:%s] crtc changed, full mode switch\n",`
	`11561`	`+ encoder->base.base.id,`
	`11562`	`+ encoder->base.name);`
`11559`	`11563`	`config->mode_changed = true;`
`11560`	`11564`	`}`
`11561`	`11565`	`}`
`@@ -11576,7 +11580,8 @@ intel_modeset_stage_output_state(struct drm_device *dev,`
`11576`	`11580`	`}`
`11577`	`11581`
`11578`	`11582`	`if (crtc->new_enabled != crtc->base.state->enable) {`
`11579`		`- DRM_DEBUG_KMS("crtc %sabled, full mode switch\n",`
	`11583`	`+ DRM_DEBUG_KMS("[CRTC:%d] %sabled, full mode switch\n",`
	`11584`	`+ crtc->base.base.id,`
`11580`	`11585`	`crtc->new_enabled ? "en" : "dis");`
`11581`	`11586`	`config->mode_changed = true;`
`11582`	`11587`	`}`