Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Mollify assert to be consistent with the scanout flush 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-06-30 10:46:00 +01:00
parent 2e0000688d
commit 05f6183075
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sna/sna_accel.c
View 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))