xf86-video-intel: 3 commits - src/sna/sna_display.c tools/virtual.c

[Chris Wilson]

 src/sna/sna_display.c |   34 ++++++++++++++++++----------------
 tools/virtual.c       |    7 +++++--
 2 files changed, 23 insertions(+), 18 deletions(-)

New commits:
commit d65b57cd332ca4435867afa31b6da85481635d52
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 27 12:59:25 2013 +0000

    intel-virtual-output: Trim remote framebuffer to fit
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index e522264..f0915a4 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -1044,8 +1044,10 @@ static int context_update(struct context *ctx)
 				y2 = v;
 		}
 
+		x2 -= x1;
+		y2 -= y1;
 		DBG(("%s fb bounds (%d, %d)x(%d, %d)\n", DisplayString(display->dpy),
-		     x1, y1, x2-x1, y2-y1));
+		     x1, y1, x2, y2));
 
 		res = _XRRGetScreenResourcesCurrent(display->dpy, display->root);
 		if (res == NULL)
commit dd7c556072978822c1110346354acfa3362b012e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 27 12:57:09 2013 +0000

    intel-virtual-output: Workaround mutter always using the same timestamp
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index dd938a0..e522264 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -931,7 +931,8 @@ static int context_update(struct context *ctx)
 		return 0;
 
 	DBG(("%s timestamp %ld (last %ld)\n", DisplayString(dpy), res->timestamp, ctx->display->timestamp));
-	if (res->timestamp == ctx->display->timestamp) {
+	if (res->timestamp == ctx->display->timestamp &&
+	    res->timestamp != res->configTimestamp) { /* mutter be damned */
 		XRRFreeScreenResources(res);
 		return 0;
 	}
commit 1085e6c93288de2275791ce9c585142870dc0877
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Nov 26 16:13:23 2013 +0000

    sna: Update connector-type-to-string mapping
    
    Add in a couple of newcomers to the connector type and make it easier to
    track updates in future.
    
    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 7a92fb8..53324c6 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2577,22 +2577,24 @@ static const int subpixel_conv_table[] = {
 	SubPixelNone
 };
 
-static const char *output_names[] = {
-	"None",
-	"VGA",
-	"DVI",
-	"DVI",
-	"DVI",
-	"Composite",
-	"TV",
-	"LVDS",
-	"CTV",
-	"DIN",
-	"DP",
-	"HDMI",
-	"HDMI",
-	"TV",
-	"eDP",
+static const char * const output_names[] = {
+	/* DRM_MODE_CONNECTOR_Unknown */	"None",
+	/* DRM_MODE_CONNECTOR_VGA */		"VGA",
+	/* DRM_MODE_CONNECTOR_DVII */		"DVI",
+	/* DRM_MODE_CONNECTOR_DVID */		"DVI",
+	/* DRM_MODE_CONNECTOR_DVIA */		"DVI",
+	/* DRM_MODE_CONNECTOR_Composite */	"Composite",
+	/* DRM_MODE_CONNECTOR_SVIDEO */		"TV",
+	/* DRM_MODE_CONNECTOR_LVDS */		"LVDS",
+	/* DRM_MODE_CONNECTOR_Component */	"CTV",
+	/* DRM_MODE_CONNECTOR_9PinDIN */	"DIN",
+	/* DRM_MODE_CONNECTOR_DisplayPort */	"DP",
+	/* DRM_MODE_CONNECTOR_HDMIA */		"HDMI",
+	/* DRM_MODE_CONNECTOR_HDMIB */		"HDMI",
+	/* DRM_MODE_CONNECTOR_TV */		"TV",
+	/* DRM_MODE_CONNECTOR_eDP */		"eDP",
+	/* DRM_MODE_CONNECTOR_VIRTUAL */	"Virtual",
+	/* DRM_MODE_CONNECTOR_DSI */		"DSI"
 };
 
 static bool