From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 25 Apr 2012 21:48:47 +0000 (+0200)
Subject: nouveau: Bail out from nouveau_fence_wait if flushing the pushbuf fails.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12f65e38c004c54f2e7c3c75b8151bb89a654f0c;p=mesa.git

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

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);