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

sna: Cancel the immediate batch submit once handled in the block handler 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-12-22 22:15:42 +00:00
parent 609e1d9da2
commit f8575b8bd1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sna/sna_accel.c
View File

@ -8815,6 +8815,7 @@ sna_accel_flush_callback(CallbackListPtr *list,
}
kgem_submit(&sna->kgem);
sna->kgem.flush_now = 0;
if (sna->kgem.sync) {
kgem_sync(&sna->kgem);
@ -8901,7 +8902,7 @@ static Bool sna_accel_do_flush(struct sna *sna)
if (sna->kgem.flush_now) {
sna->kgem.flush_now = 0;
if (priv->gpu_bo->rq != NULL) {
if (priv->gpu_bo->exec) {
DBG(("%s -- forcing flush\n", __FUNCTION__));
sna_accel_drain_timer(sna, FLUSH_TIMER);
return TRUE;
@ -8910,7 +8911,7 @@ static Bool sna_accel_do_flush(struct sna *sna)
return_if_timer_active(FLUSH_TIMER);
if (priv->cpu_damage == NULL && priv->gpu_bo->rq == NULL) {
if (priv->cpu_damage == NULL && priv->gpu_bo->exec == NULL) {
DBG(("%s -- no pending write to scanout\n", __FUNCTION__));
return FALSE;
}
@ -9031,6 +9032,7 @@ static bool sna_accel_flush(struct sna *sna)
sna_pixmap_move_to_gpu(priv->pixmap);
sna->kgem.busy = !nothing_to_do;
kgem_bo_flush(&sna->kgem, priv->gpu_bo);
sna->kgem.flush_now = 0;
return need_throttle;
}