sna: Mollify assert to be consistent with the scanout flush
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 30 Jun 2014 09:46:00 +0000 (10:46 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 30 Jun 2014 09:46:00 +0000 (10:46 +0100)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/sna/sna_accel.c

index fe10bf2..6eafd26 100644 (file)
@@ -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))