aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-04 19:40:00 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 00:11:27 -0500
commita169f09b96306cc353ffe0e1bc4bc0e1e9492281 (patch)
treee850f6424864e03cb2836152f39eadeffa9748f8
parentaa2c2e8039e3692065022a7ff885009b2d88818a (diff)
drm/nv50: 0x50c0 apparently works on NVA3+ too, so lets allow it
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_graph.c9
1 files changed, 4 insertions, 5 deletions
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)
451 } 451 }
452 452
453 /* compute */ 453 /* compute */
454 if (dev_priv->chipset <= 0xa0 || 454 NVOBJ_CLASS(dev, 0x50c0, GR);
455 dev_priv->chipset == 0xaa || 455 if (dev_priv->chipset > 0xa0 &&
456 dev_priv->chipset == 0xac) 456 dev_priv->chipset != 0xaa &&
457 NVOBJ_CLASS(dev, 0x50c0, GR); 457 dev_priv->chipset != 0xac)
458 else
459 NVOBJ_CLASS(dev, 0x85c0, GR); 458 NVOBJ_CLASS(dev, 0x85c0, GR);
460 459
461 dev_priv->engine.graph.registered = true; 460 dev_priv->engine.graph.registered = true;