summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-01-07 13:47:57 +1000
committerDave Airlie <airlied@redhat.com>2010-01-11 14:41:17 +1000
commitcc6e496587502057af02139931736b0b7a49f637 (patch)
tree7aea86122a8efb91b2a3fa50f1fb97ede0cf6a5d
parentd6126c5c8b2019658aadc9754dca80a7573dbff5 (diff)
downloadop-kernel-dev-cc6e496587502057af02139931736b0b7a49f637.zip
op-kernel-dev-cc6e496587502057af02139931736b0b7a49f637.tar.gz
drm/nv04: differentiate between nv04/nv05
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index a6b573e..09b9a46 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -642,7 +642,10 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
dev_priv->chipset = (reg0 & 0xff00000) >> 20;
/* NV04 or NV05 */
} else if ((reg0 & 0xff00fff0) == 0x20004000) {
- dev_priv->chipset = 0x04;
+ if (reg0 & 0x00f00000)
+ dev_priv->chipset = 0x05;
+ else
+ dev_priv->chipset = 0x04;
} else
dev_priv->chipset = 0xff;
OpenPOWER on IntegriCloud