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

Chris Wilson ickle at kemper.freedesktop.org
Fri Jun 7 06:51:48 PDT 2013


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

New commits:
commit 2f91643cde954c23633c6f91940f7216796b949c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 7 14:50:55 2013 +0100

    sna/dri: Fix transcription error in commit ab47433b20
    
    Reversed a predicate causing it to fail to blit when it had a
    drawable (and worse dereferencing a NULL pointer) instead of terminating
    when the Drawable was gone.
    
    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 8b055e6..9e8a418 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1772,7 +1772,7 @@ static void sna_dri_flip_event(struct sna *sna,
 			sna_dri_frame_event_info_free(sna, flip->draw, flip);
 		} else if (!sna_dri_flip_continue(sna, flip)) {
 			DBG(("%s: no longer able to flip\n", __FUNCTION__));
-			if (flip->draw || !sna_dri_immediate_blit(sna, flip, false, flip->mode == 1))
+			if (flip->draw == NULL || !sna_dri_immediate_blit(sna, flip, false, flip->mode == 1))
 				sna_dri_frame_event_info_free(sna, flip->draw, flip);
 		}
 		break;


More information about the xorg-commit mailing list