diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-05 09:40:00 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 15:11:27 +1000 |
| commit | a169f09b96306cc353ffe0e1bc4bc0e1e9492281 (patch) | |
| tree | e850f6424864e03cb2836152f39eadeffa9748f8 /drivers/gpu/drm/nouveau/nv50_graph.c | |
| parent | aa2c2e8039e3692065022a7ff885009b2d88818a (diff) | |
| download | op-kernel-dev-a169f09b96306cc353ffe0e1bc4bc0e1e9492281.zip op-kernel-dev-a169f09b96306cc353ffe0e1bc4bc0e1e9492281.tar.gz | |
drm/nv50: 0x50c0 apparently works on NVA3+ too, so lets allow it
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_graph.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_graph.c | 9 |
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 7a98d41..6785269 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; |
