drm/nv50: 0x50c0 apparently works on NVA3+ too, so lets allow it
authorBen Skeggs <bskeggs@redhat.com>
Thu, 4 Nov 2010 23:40:00 +0000 (09:40 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 3 Dec 2010 05:11:27 +0000 (15:11 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_graph.c

index 7a98d41..6785269 100644 (file)
@@ -451,11 +451,10 @@ nv50_graph_register(struct drm_device *dev)
        }
 
        /* compute */
-       if (dev_priv->chipset <= 0xa0 ||
-           dev_priv->chipset == 0xaa ||
-           dev_priv->chipset == 0xac)
-               NVOBJ_CLASS(dev, 0x50c0, GR);
-       else
+       NVOBJ_CLASS(dev, 0x50c0, GR);
+       if (dev_priv->chipset  > 0xa0 &&
+           dev_priv->chipset != 0xaa &&
+           dev_priv->chipset != 0xac)
                NVOBJ_CLASS(dev, 0x85c0, GR);
 
        dev_priv->engine.graph.registered = true;