From 12f65e38c004c54f2e7c3c75b8151bb89a654f0c Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Wed, 25 Apr 2012 23:48:47 +0200 Subject: [PATCH] nouveau: Bail out from nouveau_fence_wait if flushing the pushbuf fails. --- src/gallium/drivers/nouveau/nouveau_fence.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_fence.c b/src/gallium/drivers/nouveau/nouveau_fence.c index d2f98654f31..669aced7815 100644 --- a/src/gallium/drivers/nouveau/nouveau_fence.c +++ b/src/gallium/drivers/nouveau/nouveau_fence.c @@ -195,8 +195,10 @@ nouveau_fence_wait(struct nouveau_fence *fence) if (fence == screen->fence.current) nouveau_fence_new(screen, &screen->fence.current, FALSE); } - if (fence->state < NOUVEAU_FENCE_STATE_FLUSHED) - nouveau_pushbuf_kick(screen->pushbuf, screen->pushbuf->channel); + if (fence->state < NOUVEAU_FENCE_STATE_FLUSHED) { + if (nouveau_pushbuf_kick(screen->pushbuf, screen->pushbuf->channel)) + return FALSE; + } do { nouveau_fence_update(screen, FALSE); -- 2.30.2