Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...

[pandora-kernel.git] / drivers / gpu / drm / nouveau / nvc0_fifo.c

diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/nvc0_fifo.c
index 6f9f341..dcbe0d5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_fifo.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fifo.c
@@ -322,7 +322,7 @@ nvc0_fifo_init(struct drm_device *dev)
        }
 
        /* PSUBFIFO[n] */
-       for (i = 0; i < 3; i++) {
+       for (i = 0; i < priv->spoon_nr; i++) {
                nv_mask(dev, 0x04013c + (i * 0x2000), 0x10000100, 0x00000000);
                nv_wr32(dev, 0x040108 + (i * 0x2000), 0xffffffff); /* INTR */
                nv_wr32(dev, 0x04010c + (i * 0x2000), 0xfffffeff); /* INTR_EN */