From 785f2635148f5670adfb6bb5f5813e21ccd2da9f Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 5 Nov 2010 09:40:00 +1000
Subject: [PATCH] --- yaml --- r: 228564 b: refs/heads/master c:
 a169f09b96306cc353ffe0e1bc4bc0e1e9492281 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 330aa1b3fcab..e96f79b464ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa2c2e8039e3692065022a7ff885009b2d88818a
+refs/heads/master: a169f09b96306cc353ffe0e1bc4bc0e1e9492281
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_graph.c b/trunk/drivers/gpu/drm/nouveau/nv50_graph.c
index 7a98d41c68a6..6785269f778a 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/trunk/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;