drm/nvc0/fifo: avoid touching missing subfifos
authorBen Skeggs <bskeggs@redhat.com>
Thu, 25 Aug 2011 05:53:57 +0000 (15:53 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 20 Sep 2011 06:12:18 +0000 (16:12 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvc0_fifo.c

index 6f9f341c3e868f408c35f70aa4907cc9a3c333d7..dcbe0d5d0241362a6a97b0662c73b0f94cd76472 100644 (file)
@@ -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 */