From c45a196f719555f1532026c2495dfb5bc84a1dbe Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 30 Sep 2010 09:09:42 +1000
Subject: [PATCH] --- yaml --- r: 218239 b: refs/heads/master c:
 62841ab726def838472dfaaee571a0d30a2ce1e0 h: refs/heads/master i:   218237:
 90cc9d9838d37c975c6a225ffd4392bf11497dc4   218235:
 5339b97c05663846f292468d5c0e542615e469bd   218231:
 304b6d8770de139ca4cc81d5603da8bde329eba6   218223:
 f826c33f3c88b7792955089f980b80a501dfa93a   218207:
 af2ea0556c2a7c99cb611169b9dcfb80ac785691   218175:
 25c3c4767a9e5854582549b6c12ab22dc6d1f822   218111:
 66d32e678627b59e2c45bde8db417154cf85e6d0 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index db2d991e0d12..4a0c8d87f6ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd2fb2e9e0a6a3273d353b18e4bdd21cc0482724
+refs/heads/master: 62841ab726def838472dfaaee571a0d30a2ce1e0
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c
index 9d27acda87e2..eb24e2b05193 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -214,7 +214,7 @@ nv50_dma_push_wait(struct nouveau_channel *chan, int count)
 
 		chan->dma.ib_free = get - chan->dma.ib_put;
 		if (chan->dma.ib_free <= 0)
-			chan->dma.ib_free += chan->dma.ib_max + 1;
+			chan->dma.ib_free += chan->dma.ib_max;
 	}
 
 	return 0;