nouveau: Poke 0x2230 on NV47 also.
authorBen Skeggs <skeggsb@gmail.com>
Mon, 20 Aug 2007 16:18:27 +0000 (02:18 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 20 Aug 2007 16:18:27 +0000 (02:18 +1000)
Makes 0x2220 work the same way as on NV40.

shared-core/nouveau_fifo.c

index f0c2a5563fe6915e3e104eb10f6f87abe0b37659..1aa724f106b8664dc658c6cccf0a68b75c57604c 100644 (file)
@@ -84,9 +84,16 @@ static int nouveau_fifo_instmem_configure(struct drm_device *dev)
        {
                case NV_50:
                case NV_40:
+                       switch (dev_priv->chipset) {
+                       case 0x47:
+                       case 0x49:
+                       case 0x4b:
+                               NV_WRITE(0x2230, 1);
+                               break;
+                       default:
+                               break;
+                       }
                        NV_WRITE(NV40_PFIFO_RAMFC, 0x30002);
-                       if((dev_priv->chipset == 0x49) || (dev_priv->chipset == 0x4b))
-                               NV_WRITE(0x2230,0x00000001);
                        break;
                case NV_44:
                        NV_WRITE(NV40_PFIFO_RAMFC, ((nouveau_mem_fb_amount(dev)-512*1024+dev_priv->ramfc_offset)>>16) |