xf86-video-intel: 2 commits - src/sna/brw src/sna/Makefile.am src/sna/sna_display.c src/sna/sna_display_fake.c

[Chris Wilson]

 src/sna/Makefile.am        |    3 ++-
 src/sna/brw/Makefile.am    |    3 ++-
 src/sna/sna_display.c      |    5 ++---
 src/sna/sna_display_fake.c |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)

New commits:
commit 98efd7f5d94586f8d7c5b2e9c5515f4b37149b08
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 25 15:33:13 2013 +0000

    sna: Log mode switches on virtual outputs
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 8982d6a..3cf669d 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1499,10 +1499,9 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		return FALSE;
 
 	xf86DrvMsg(crtc->scrn->scrnIndex, X_INFO,
-		   "switch to mode %dx%d@%.1f on pipe %d using %s, position (%d, %d), rotation %s\n",
+		   "switch to mode %dx%d@%.1f on %s using pipe %d, position (%d, %d), rotation %s\n",
 		   mode->HDisplay, mode->VDisplay, xf86ModeVRefresh(mode),
-		   sna_crtc->pipe,
-		   outputs_for_crtc(crtc, outputs, sizeof(outputs)),
+		   outputs_for_crtc(crtc, outputs, sizeof(outputs)), sna_crtc->pipe,
 		   x, y, rotation_to_str(rotation));
 
 	assert(mode->HDisplay <= sna->mode.kmode->max_width &&
diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c
index 29426b7..8d24af0 100644
--- a/src/sna/sna_display_fake.c
+++ b/src/sna/sna_display_fake.c
@@ -38,10 +38,48 @@ sna_crtc_dpms(xf86CrtcPtr crtc, int mode)
 {
 }
 
+static char *outputs_for_crtc(xf86CrtcPtr crtc, char *outputs, int max)
+{
+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
+	int len, i;
+
+	for (i = len = 0; i < config->num_output; i++) {
+		xf86OutputPtr output = config->output[i];
+
+		if (output->crtc != crtc)
+			continue;
+
+		len += snprintf(outputs+len, max-len, "%s, ", output->name);
+	}
+	assert(len >= 2);
+	outputs[len-2] = '\0';
+
+	return outputs;
+}
+
+static const char *rotation_to_str(Rotation rotation)
+{
+	switch (rotation) {
+	case RR_Rotate_0: return "normal";
+	case RR_Rotate_90: return "right";
+	case RR_Rotate_180: return "inverted";
+	case RR_Rotate_270: return "left";
+	default: return "unknown";
+	}
+}
+
 static Bool
 sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 			Rotation rotation, int x, int y)
 {
+	char outputs[256];
+
+	xf86DrvMsg(crtc->scrn->scrnIndex, X_INFO,
+		   "switch to mode %dx%d on %s, position (%d, %d), rotation %s\n",
+		   mode->HDisplay, mode->VDisplay,
+		   outputs_for_crtc(crtc, outputs, sizeof(outputs)),
+		   x, y, rotation_to_str(rotation));
+
 	return TRUE;
 }
 
commit 42f325a87c336211ebb3ebcafc9130eff10cee93
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Nov 25 11:14:15 2013 +0000

    sna: Keep @NOWARNFLAGS@ last
    
    As the last option overrides the earlier options, make sure these
    particular overrides always take effect by adding them last.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index 604ae25..3377b9c 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -22,7 +22,6 @@ SUBDIRS = brw fb
 
 AM_CFLAGS = \
 	@CWARNFLAGS@ \
-	@NOWARNFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/render_program \
 	$(XORG_CFLAGS) \
@@ -135,3 +134,5 @@ git_version.h: $(top_srcdir)/.git/HEAD $(shell sed -e '/ref:/!d' -e 's#ref: *#$(
 	@V=`git describe`; echo "static const char git_version[] = \"$$V\";" > git_version.h
 sna_driver.c: git_version.h
 endif
+
+AM_CFLAGS += @NOWARNFLAGS@
diff --git a/src/sna/brw/Makefile.am b/src/sna/brw/Makefile.am
index 61deb71..3805646 100644
--- a/src/sna/brw/Makefile.am
+++ b/src/sna/brw/Makefile.am
@@ -29,7 +29,6 @@ AM_CFLAGS = \
 	@XORG_CFLAGS@ \
 	@UDEV_CFLAGS@ \
 	@DRM_CFLAGS@ \
-	@NOWARNFLAGS@ \
 	$(NULL)
 
 if DEBUG
@@ -58,3 +57,5 @@ brw_test_SOURCES = \
 brw_test_LDADD = \
 	libbrw.la \
 	$(NULL)
+
+AM_CFLAGS += @NOWARNFLAGS@