xf86-video-intel: 3 commits - src/sna/gen7_render.c src/sna/sna_accel.c src/sna/sna_display.c

[Chris Wilson]

 src/sna/gen7_render.c |    2 +-
 src/sna/sna_accel.c   |    2 +-
 src/sna/sna_display.c |   10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 9fb18462ec1428a486f998585e7b4caf4dd08f53
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon May 21 14:12:23 2012 +0100

    sna: Confirm that the modeset takes
    
    If we attempt to change to a mode with a disabled connector the kernel
    will silently switch off that connector (and crtc) and report that the
    modeswitch is successful.
    
    Reported-by: Kyle Hill <kyle.hill at tacomafia.net>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=50078
    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 3f8beea..d850025 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -442,10 +442,8 @@ sna_crtc_apply(xf86CrtcPtr crtc)
 		xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
 			   "failed to set mode: %s\n", strerror(-ret));
 		ret = FALSE;
-	} else {
-		sna_crtc->active = 1;
-		ret = TRUE;
-	}
+	} else
+		ret = sna_crtc->active = sna_crtc_is_bound(sna, crtc);
 
 	if (scrn->pScreen)
 		xf86_reload_cursors(scrn->pScreen);
@@ -508,8 +506,8 @@ sna_crtc_dpms(xf86CrtcPtr crtc, int mode)
 	DBG(("%s(pipe %d, dpms mode -> %d):= active=%d\n",
 	     __FUNCTION__, sna_crtc->pipe, mode, mode == DPMSModeOn));
 
-	sna_crtc->active = mode == DPMSModeOn;
-	if (mode == DPMSModeOn)
+	sna_crtc->active = false;
+	if (mode != DPMSModeOff)
 		sna_crtc_restore(sna_crtc->sna);
 }
 
commit cd3b48854403ee63723ef570c1a7f9f8447e7105
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat May 19 12:56:45 2012 +0100

    sna/gen7: Trim a dead assignment
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 362ddff..9eed660 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1663,7 +1663,7 @@ inline static int gen7_get_rectangles(struct sna *sna,
 				      int want,
 				      void (*emit_state)(struct sna *sna, const struct sna_composite_op *op))
 {
-	int rem = vertex_space(sna);
+	int rem;
 
 start:
 	rem = vertex_space(sna);
commit cf79cd3e27b7077f67f202b16ed39eb1cc70ac65
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat May 19 12:44:11 2012 +0100

    sna: Emit a new batch if we need to clip after PolyText without space
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 8b1ab65..02c11cf 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -11266,7 +11266,7 @@ skip:
 		if (++extents == last_extents)
 			break;
 
-		if (kgem_check_batch(&sna->kgem, 3)) {
+		if (kgem_check_batch(&sna->kgem, 3 + 5)) {
 			b = sna->kgem.batch + sna->kgem.nbatch;
 			sna->kgem.nbatch += 3;