drm/nv04: differentiate between nv04/nv05

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

drm/nv04: differentiate between nv04/nv05
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
cc6e4965 · Ben Skeggs · Dave Airlie · d6126c5c · cc6e4965
Commit cc6e4965 authored Jan 07, 2010 by Ben Skeggs Committed by Dave Airlie Jan 11, 2010
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

drivers/gpu/drm/nouveau/nouveau_state.c drivers/gpu/drm/nouveau/nouveau_state.c +4 -1

No files found.
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -642,6 +642,9 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
 		dev_priv->chipset = (reg0 & 0xff00000) >> 20;
 	/* NV04 or NV05 */
 	} else if ((reg0 & 0xff00fff0) == 0x20004000) {
+		if (reg0 & 0x00f00000)
+			dev_priv->chipset = 0x05;
+		else
 			dev_priv->chipset = 0x04;
 	} else
 		dev_priv->chipset = 0xff;