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

[Chris Wilson]

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

New commits:
commit 6fc7b16b931946995ffab99c5216810417cfeb99
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 25 17:08:59 2015 +0100

    sna/dri2: Remove overzealous assertion
    
    sna_dri2_xchg() is also called on the flip path to do an immediate swap
    of a hidden buffer, in which case can_xchg() returns false as it
    believes that the swap requires a flip.
    
    Reported-by: Jiri Slaby <jirislaby at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70461#c109
    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 8edc381..b2814da 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -2128,7 +2128,6 @@ sna_dri2_xchg(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back)
 	     __FUNCTION__, back_bo->handle, back_bo->pitch, kgem_bo_size(back_bo), back_bo->refcnt, back_bo->active_scanout));
 	DBG(("%s: front_bo handle=%d, pitch=%d, size=%d, ref=%d, active_scanout?=%d\n",
 	     __FUNCTION__, front_bo->handle, front_bo->pitch, kgem_bo_size(front_bo), front_bo->refcnt, front_bo->active_scanout));
-	assert(can_xchg(to_sna_from_drawable(draw), draw, front, back));
 
 	assert(front_bo != back_bo);
 	assert(front_bo->refcnt);