From: Ben Skeggs Date: Thu, 25 Aug 2011 05:53:57 +0000 (+1000) Subject: drm/nvc0/fifo: avoid touching missing subfifos X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3dcbb02b3a9ad1722005290e7c9ac47097de517d;p=deliverable%2Flinux.git drm/nvc0/fifo: avoid touching missing subfifos Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/nvc0_fifo.c index 6f9f341c3e86..dcbe0d5d0241 100644 --- 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 */