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

[Chris Wilson]

 src/sna/sna_display.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b70390b4f824afeed8f1b5a9baf79e33377405cd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 23 11:15:28 2013 +0100

    sna: Reset bo after allocation failure during wait-for-shadow
    
    If we fail to allocate an alternate bo to replace the still visible
    scanout bo, we stall and were supposed to continue using the old
    wait->bo. However, we chose to use NULL instead which is going to lead
    to an eventual crash.
    
    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 7423136..7fcade6 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4325,6 +4325,8 @@ static bool wait_for_shadow(struct sna *sna, struct sna_pixmap *priv, unsigned f
 			while (sna->mode.shadow_flip &&
 			       sna_mode_wait_for_event(sna))
 				sna_mode_wakeup(sna);
+
+			bo = wait->bo;
 		}
 	}