xf86-video-intel: src/sna/sna_dri2.c

[Chris Wilson]

 src/sna/sna_dri2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84854419471ebd338ae20d411e44f256be569d1a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Aug 19 23:24:17 2015 +0100

    sna/dri2: Don't queue a vblank delay for a pixmap swap
    
    Otherwise we raise assertions about trying to attach events to an
    illegal Window.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index f805d26..e393f09 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -3338,7 +3338,7 @@ blit:
 	}
 skip:
 	DBG(("%s: unable to show frame, unblocking client\n", __FUNCTION__));
-	if (crtc == NULL)
+	if (crtc == NULL && draw->type != DRAWABLE_PIXMAP)
 		crtc = sna_primary_crtc(sna);
 	if (crtc && (sna->flags & SNA_NO_WAIT) == 0) {
 		if (info == NULL)