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

[Chris Wilson]

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

New commits:
commit 05f6183075867d582b7f9f74aec42e632e3d83dd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 30 10:46:00 2014 +0100

    sna: Mollify assert to be consistent with the scanout flush
    
    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 fe10bf2..6eafd26 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -17098,7 +17098,7 @@ static bool start_flush(struct sna *sna)
 		return true;
 	}
 
-	if (scanout->cpu_damage || scanout->gpu_bo->exec)
+	if (scanout->cpu_damage || scanout->gpu_bo->needs_flush)
 		return true;
 
 	kgem_scanout_flush(&sna->kgem, scanout->gpu_bo);
@@ -17814,7 +17814,7 @@ restart:
 	if (sna_scanout_do_flush(sna))
 		sna_scanout_flush(sna);
 	assert(sna_accel_scanout(sna) == NULL ||
-	       sna_accel_scanout(sna)->gpu_bo->exec == NULL ||
+	       sna_accel_scanout(sna)->gpu_bo->needs_flush == NULL ||
 	       sna->timer_active & (1<<(FLUSH_TIMER)));
 
 	if (sna_accel_do_throttle(sna))