From b7aa05e44b1f88284183c1c73bb074dd5dce74cb Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 28 May 2013 23:01:30 +0100
Subject: [PATCH] sna: Sanity check that CRTC / output combination is valid

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_display.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 969d9615..e927282b 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -740,7 +740,15 @@ sna_crtc_apply(xf86CrtcPtr crtc)
 		if (output->crtc != crtc)
 			continue;
 
+		assert(output->possible_crtcs & (1 << i));
+
 		sna_output = output->driver_private;
+
+		DBG(("%s: attaching output '%s' %d [%d] to crtc:%d (pipe %d) (possible crtc:%x, possible clones:%x)\n",
+		     __FUNCTION__, output->name, i,
+		     sna_output->mode_output->connector_id,
+		     sna_crtc->id, sna_crtc->pipe,
+		     output->possible_crtcs, output->possible_clones));
 		output_ids[output_count] =
 			sna_output->mode_output->connector_id;
 		output_count++;
@@ -761,8 +769,8 @@ sna_crtc_apply(xf86CrtcPtr crtc)
 	arg.mode = sna_crtc->kmode;
 	arg.mode_valid = 1;
 
-	DBG(("%s: applying crtc [%d] mode=%dx%d+%d+%d@%d, fb=%d%s%s update to %d outputs\n",
-	     __FUNCTION__, sna_crtc->id,
+	DBG(("%s: applying crtc [%d, pipe=%d] mode=%dx%d+%d+%d@%d, fb=%d%s%s update to %d outputs [%d...]\n",
+	     __FUNCTION__, sna_crtc->id, sna_crtc->pipe,
 	     arg.mode.hdisplay,
 	     arg.mode.vdisplay,
 	     arg.x, arg.y,
@@ -770,7 +778,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
 	     arg.fb_id,
 	     sna_crtc->shadow ? " [shadow]" : "",
 	     sna_crtc->transform ? " [transformed]" : "",
-	     output_count));
+	     output_count, output_count ? output_ids[0] : 0));
 
 	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg))
 		return false;
@@ -2389,6 +2397,11 @@ sna_output_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
 	output->possible_clones = enc.possible_clones;
 	output->interlaceAllowed = TRUE;
 
+	DBG(("%s: created output '%s' %d [%d]  (possible crtc:%x, possible clones:%x)\n",
+	     __FUNCTION__, name, num,
+	     sna_output->mode_output->connector_id,
+	     output->possible_crtcs, output->possible_clones));
+
 	return;
 
 cleanup_output: