diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-12-11 16:58:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-12-11 16:58:00 +1000 |
| commit | 8d2da202337300e821f4867cb2654b41ff6053b6 (patch) | |
| tree | c7b0c4644c99180081eaa3f2e4bf0d1b4f8bbd63 /shared-core/nouveau_state.c | |
| parent | f99dea7db00dd46aa96eaed3a61dff9c956fd86f (diff) | |
| parent | cfa21b22b43c7113107b5eb086b5f4d4ec36dc0a (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c
Diffstat (limited to 'shared-core/nouveau_state.c')
| -rw-r--r-- | shared-core/nouveau_state.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 7c9503e8..16c86494 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -454,6 +454,9 @@ int nouveau_firstopen(struct drm_device *dev) return 0; } +#define NV40_CHIPSET_MASK 0x00000baf +#define NV44_CHIPSET_MASK 0x00005450 + int nouveau_load(struct drm_device *dev, unsigned long flags) { struct drm_nouveau_private *dev_priv; @@ -497,10 +500,16 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) if (architecture >= 0x50) { dev_priv->card_type = NV_50; - } else if (architecture >= 0x44) { - dev_priv->card_type = NV_44; } else if (architecture >= 0x40) { - dev_priv->card_type = NV_40; + uint8_t subarch = architecture & 0xf; + /* Selection criteria borrowed from NV40EXA */ + if (NV40_CHIPSET_MASK & (1 << subarch)) { + dev_priv->card_type = NV_40; + } else if (NV44_CHIPSET_MASK & (1 << subarch)) { + dev_priv->card_type = NV_44; + } else { + dev_priv->card_type = NV_UNKNOWN; + } } else if (architecture >= 0x30) { dev_priv->card_type = NV_30; } else if (architecture >= 0x20) { |