[Intel-gfx] [PATCH] drm/i915: add spam for force-load-detect

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Tue Mar 1 10:52:52 UTC 2016


Patch to force CI to reveal why force-load-detect test fails.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 368d24728b16..7b4c8aed91a6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10445,7 +10445,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
 	struct intel_crtc_state *crtc_state;
 	int ret, i = -1;
 
-	DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
+	DRM_ERROR("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
 		      connector->base.id, connector->name,
 		      encoder->base.id, encoder->name);
 
@@ -10501,7 +10501,7 @@ retry:
 	 * If we didn't find an unused CRTC, don't use any.
 	 */
 	if (!crtc) {
-		DRM_DEBUG_KMS("no pipe available for load-detect\n");
+		DRM_ERROR("no pipe available for load-detect\n");
 		goto fail;
 	}
 
@@ -10552,12 +10552,12 @@ found:
 	 */
 	fb = mode_fits_in_fbdev(dev, mode);
 	if (fb == NULL) {
-		DRM_DEBUG_KMS("creating tmp fb for load-detection\n");
+		DRM_ERROR("creating tmp fb for load-detection\n");
 		fb = intel_framebuffer_create_for_mode(dev, mode, 24, 32);
 	} else
-		DRM_DEBUG_KMS("reusing fbdev for load-detection framebuffer\n");
+		DRM_ERROR("reusing fbdev for load-detection framebuffer\n");
 	if (IS_ERR(fb)) {
-		DRM_DEBUG_KMS("failed to allocate framebuffer for load-detection\n");
+		DRM_ERROR("failed to allocate framebuffer for load-detection\n");
 		goto fail;
 	}
 
@@ -10577,13 +10577,13 @@ found:
 	if (!ret)
 		ret = PTR_ERR_OR_ZERO(drm_atomic_get_plane_state(restore_state, crtc->primary));
 	if (ret) {
-		DRM_DEBUG_KMS("Failed to create a copy of old state to restore: %i\n", ret);
+		DRM_ERROR("Failed to create a copy of old state to restore: %i\n", ret);
 		goto fail;
 	}
 
 	ret = drm_atomic_commit(state);
 	if (ret) {
-		DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
+		DRM_ERROR("failed to set mode on load-detect pipe\n");
 		goto fail;
 	}
 
@@ -10602,6 +10602,7 @@ fail:
 		drm_modeset_backoff(ctx);
 		goto retry;
 	}
+	DRM_ERROR("Failed with %i\n", ret);
 
 	return false;
 }
-- 
2.1.0



More information about the Intel-gfx mailing list