summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/nouveau/nouveau_fifo.c
diff options
context:
space:
mode:
authorBen Skeggs <darktama@iinet.net.au>2006-12-24 00:13:34 +1100
committerBen Skeggs <darktama@iinet.net.au>2006-12-24 00:13:34 +1100
commitf54c725497cac19294e1465413d21a9416d4245f (patch)
tree8f33a5aa02c73898fd5cc3cf294f12860e659758 /src/mesa/drivers/dri/nouveau/nouveau_fifo.c
parentcb6a400dcd26089101c8a29a4eee198bd7ad9a58 (diff)
nouveau: Modify span routines to use nouveau_renderbuffer instead of driRenderbuffer
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_fifo.c')
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_fifo.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fifo.c b/src/mesa/drivers/dri/nouveau/nouveau_fifo.c
index 0b745e1e74..fcfc0ebe14 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fifo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fifo.c
@@ -77,6 +77,12 @@ void nouveauWaitForIdleLocked(nouveauContextPtr nmesa)
FIRE_RING();
while(RING_AHEAD()>0);
+ /* We can't wait on PGRAPH going idle..
+ * 1) We don't have the regs mapped
+ * 2) PGRAPH may not go idle with multiple channels active
+ * Look into replacing this with a NOTIFY/NOP + wait notifier sequence.
+ */
+#if 0
for(i=0;i<1000000;i++) /* 1 second */
{
switch(nmesa->screen->card->type)
@@ -100,6 +106,7 @@ void nouveauWaitForIdleLocked(nouveauContextPtr nmesa)
return;
DO_USLEEP(1);
}
+#endif
}
void nouveauWaitForIdle(nouveauContextPtr nmesa)