diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-01-06 22:47:57 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-01-10 23:41:17 -0500 |
commit | cc6e496587502057af02139931736b0b7a49f637 (patch) | |
tree | 7aea86122a8efb91b2a3fa50f1fb97ede0cf6a5d /drivers | |
parent | d6126c5c8b2019658aadc9754dca80a7573dbff5 (diff) |
drm/nv04: differentiate between nv04/nv05
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 5 |
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 a6b573e89829..09b9a46dfc0e 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) | |||
642 | dev_priv->chipset = (reg0 & 0xff00000) >> 20; | 642 | dev_priv->chipset = (reg0 & 0xff00000) >> 20; |
643 | /* NV04 or NV05 */ | 643 | /* NV04 or NV05 */ |
644 | } else if ((reg0 & 0xff00fff0) == 0x20004000) { | 644 | } else if ((reg0 & 0xff00fff0) == 0x20004000) { |
645 | dev_priv->chipset = 0x04; | 645 | if (reg0 & 0x00f00000) |
646 | dev_priv->chipset = 0x05; | ||
647 | else | ||
648 | dev_priv->chipset = 0x04; | ||
646 | } else | 649 | } else |
647 | dev_priv->chipset = 0xff; | 650 | dev_priv->chipset = 0xff; |
648 | 651 | ||