From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 4 Nov 2010 23:40:00 +0000 (+1000)
Subject: drm/nv50: 0x50c0 apparently works on NVA3+ too, so lets allow it
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a169f09b96306cc353ffe0e1bc4bc0e1e9492281;p=linux-beck.git

drm/nv50: 0x50c0 apparently works on NVA3+ too, so lets allow it

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index 7a98d41c68a6..6785269f778a 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -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;