diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-30 10:46:00 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-30 10:46:00 +0100 |
| commit | 05f6183075867d582b7f9f74aec42e632e3d83dd (patch) | |
| tree | a4ca0a67888c4cef4e38b5af4d1b0b5d9b6e7238 | |
| parent | 2e0000688d034535083950b98bc61745dd965352 (diff) | |
sna: Mollify assert to be consistent with the scanout flush
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_accel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index fe10bf2f..6eafd265 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)) |