nouveau: Bail out from nouveau_fence_wait if flushing the pushbuf fails.

This commit is contained in:
Francisco Jerez 2012-04-25 23:48:47 +02:00 committed by Christoph Bumiller
parent 543d032885
commit 12f65e38c0

View file

@ -195,8 +195,10 @@ nouveau_fence_wait(struct nouveau_fence *fence)
if (fence == screen->fence.current) if (fence == screen->fence.current)
nouveau_fence_new(screen, &screen->fence.current, FALSE); nouveau_fence_new(screen, &screen->fence.current, FALSE);
} }
if (fence->state < NOUVEAU_FENCE_STATE_FLUSHED) if (fence->state < NOUVEAU_FENCE_STATE_FLUSHED) {
nouveau_pushbuf_kick(screen->pushbuf, screen->pushbuf->channel); if (nouveau_pushbuf_kick(screen->pushbuf, screen->pushbuf->channel))
return FALSE;
}
do { do {
nouveau_fence_update(screen, FALSE); nouveau_fence_update(screen, FALSE);