From b3fd1556f9e94d6d6f6d3933c404fc37aec7b1a3 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <darktama@iinet.net.au>
Date: Sun, 19 Nov 2006 15:45:36 +0000
Subject: More FIFO fixes.

---
 src/mesa/drivers/dri/nouveau/nouveau_fifo.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nouveau_fifo.h')

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
index 58fb378c39..c5e5d6934f 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
@@ -100,9 +100,10 @@ extern void WAIT_RING(nouveauContextPtr nmesa,u_int32_t size);
 }while(0)
 
 #define BEGIN_RING_SIZE(subchannel,tag,size) do {					\
-	if (nmesa->fifo.free<size)							\
+	if (nmesa->fifo.free <= (size))							\
 		WAIT_RING(nmesa,(size));						\
-	OUT_RING( (size<<18) | ((subchannel) << 13) | (tag));				\
+	OUT_RING( ((size)<<18) | ((subchannel) << 13) | (tag));				\
+	nmesa->fifo.free -= ((size) + 1);                                               \
 }while(0)
 
 #define RING_AVAILABLE() (nmesa->fifo.free-1)
-- 
cgit v1.2.3