From c5548447eabe1c4e53ae4aba980fdb70e0b982a4 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Sun, 11 Jul 2010 17:19:15 +0200
Subject: [PATCH] --- yaml --- r: 205081 b: refs/heads/master c:
 dad9acff504257d37058d3452c978a4129944d99 h: refs/heads/master i:   205079:
 d37c90622634c7403fae8318f0656f02e983e4cc v: v3

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

diff --git a/[refs] b/[refs]
index 4f87183476f0..d6ce9fffd030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 112d20ad5ca06a9ec7237602ee33bef6fa881daa
+refs/heads/master: dad9acff504257d37058d3452c978a4129944d99
diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_fifo.c b/trunk/drivers/gpu/drm/nouveau/nv04_fifo.c
index b2c01fe899e9..06cedd99c26a 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv04_fifo.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv04_fifo.c
@@ -292,6 +292,7 @@ nv04_fifo_init(struct drm_device *dev)
 
 	nv04_fifo_init_intr(dev);
 	pfifo->enable(dev);
+	pfifo->reassign(dev, true);
 
 	for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
 		if (dev_priv->fifos[i]) {