From: Ben Skeggs <skeggsb@gmail.com>
Date: Fri, 21 Mar 2008 07:28:07 +0000 (+1100)
Subject: nouveau: do a retry if initial buffer alloc fails
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1a4dcde808dbd5daa58f939361d9a9b539f81b50;p=mesa.git

nouveau: do a retry if initial buffer alloc fails
---

diff --git a/src/gallium/winsys/dri/nouveau/nouveau_bo.c b/src/gallium/winsys/dri/nouveau/nouveau_bo.c
index 5dbb7d03744..46c0759dbb4 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_bo.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_bo.c
@@ -369,8 +369,13 @@ nouveau_bo_validate_bo(struct nouveau_channel *chan, struct nouveau_bo *bo,
 	int ret;
 
 	ret = nouveau_bo_set_status(bo, flags);
-	if (ret)
-		return ret;
+	if (ret) {
+		nouveau_fence_flush(chan);
+
+		ret = nouveau_bo_set_status(bo, flags);
+		if (ret)
+			return ret;
+	}
 
 	if (nvbo->user)
 		nouveau_bo_upload(nvbo);