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

[Chris Wilson]

 src/sna/sna_accel.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b6c7c490d76c683b7b5c89d20f902603b85bd3bc
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jul 26 00:48:59 2012 +0100

    sna: Check for a NULL scanout after DPMS off with shadow enabled
    
    We may mark the scanout as detached when all outputs are turned off (for
    example during rotation) and so in the subsequent block handler we need
    to be careful in case we are handling a detached shadow.
    
    Reported-by: chr.ohm at gmx.net
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52514
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 30e5e9f..4d30c5c 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -13375,7 +13375,8 @@ static bool sna_accel_do_flush(struct sna *sna)
 	} else {
 		if (!start_flush(sna, priv)) {
 			DBG(("%s -- no pending write to scanout\n", __FUNCTION__));
-			kgem_bo_flush(&sna->kgem, priv->gpu_bo);
+			if (priv)
+				kgem_bo_flush(&sna->kgem, priv->gpu_bo);
 		} else {
 			sna->timer_active |= 1 << FLUSH_TIMER;
 			sna->timer_expire[FLUSH_TIMER] =