From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 7 Jan 2010 03:47:57 +0000 (+1000)
Subject: drm/nv04: differentiate between nv04/nv05
X-Git-Tag: v2.6.33-rc6~27^2~11^2~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1dee7a930bfddd69825fca3e3f9541c8a5333876;p=~shefty%2Frdma-dev.git

drm/nv04: differentiate between nv04/nv05

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index a6b573e8982..09b9a46dfc0 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;