Skip to content

L
linux-davinci
Commit cc6e4965 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files
Options

drm/nv04: differentiate between nv04/nv05 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d6126c5c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
drivers/gpu/drm/nouveau/nouveau_state.c
View file @ cc6e4965
...@@ -642,7 +642,10 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) ...@@ -642,7 +642,10 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
dev_priv->chipset = (reg0 & 0xff00000) >> 20; dev_priv->chipset = (reg0 & 0xff00000) >> 20;
/* NV04 or NV05 */ /* NV04 or NV05 */
} else if ((reg0 & 0xff00fff0) == 0x20004000) { } else if ((reg0 & 0xff00fff0) == 0x20004000) {
dev_priv->chipset = 0x04; if (reg0 & 0x00f00000)
dev_priv->chipset = 0x05;
else
dev_priv->chipset = 0x04;
} else } else
dev_priv->chipset = 0xff; dev_priv->chipset = 0xff;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment