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

[Chris Wilson]

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

New commits:
commit be84b6929705584f30b63d6e613ff3d8e6e3dc1d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 1 16:51:38 2013 +0100

    sna/dri: Reorder assert not to fail on a pageflip deferred to after a modeset
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 06d1f21..9f8d9a7 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1584,10 +1584,10 @@ sna_dri_flip_continue(struct sna *sna, struct sna_dri_frame_event *info)
 		if (!info->draw)
 			return false;
 
-		assert(sna_pixmap_get_buffer(get_drawable_pixmap(info->draw)) == info->front);
 		if (!can_flip(sna, info->draw, info->front, info->back))
 			return false;
 
+		assert(sna_pixmap_get_buffer(get_drawable_pixmap(info->draw)) == info->front);
 		if (!sna_dri_page_flip(sna, info))
 			return false;