diff --git a/[refs] b/[refs]
index 5276ca84ff76..330aa1b3fcab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23c45e8ed203f933753fb66a6290c4ff853eb7bb
+refs/heads/master: aa2c2e8039e3692065022a7ff885009b2d88818a
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_graph.c b/trunk/drivers/gpu/drm/nouveau/nv50_graph.c
index e0f52942b2eb..7a98d41c68a6 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -425,8 +425,6 @@ nv50_graph_register(struct drm_device *dev)
 	NVOBJ_CLASS(dev, 0x0030, GR); /* null */
 	NVOBJ_CLASS(dev, 0x5039, GR); /* m2mf */
 	NVOBJ_CLASS(dev, 0x502d, GR); /* 2d */
-	NVOBJ_CLASS(dev, 0x50c0, GR); /* compute */
-	NVOBJ_CLASS(dev, 0x85c0, GR); /* compute (nva3, nva5, nva8) */
 
 	/* tesla */
 	if (dev_priv->chipset == 0x50)
@@ -452,6 +450,14 @@ 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, 0x85c0, GR);
+
 	dev_priv->engine.graph.registered = true;
 	return 0;
 }