summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>2006-11-10 02:18:38 +0100
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>2006-11-10 02:18:38 +0100
commit1123ab089075af3141c794696ec394fa46b4353f (patch)
tree3978e52aeef13d8e3dc30af7e1cffe90350e3a54
parentf7affda35bb0c47fbc973725e05847669e215d46 (diff)
Fix memory detection on TNT2 M64/TNT2 vanta.
-rw-r--r--shared-core/nouveau_mem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c
index 91fc6046..897badd4 100644
--- a/shared-core/nouveau_mem.c
+++ b/shared-core/nouveau_mem.c
@@ -234,6 +234,9 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev)
break;
case NV_04:
case NV_05:
+ if (NV_READ(NV03_BOOT_0) & 0x00000100) {
+ return (((NV_READ(NV03_BOOT_0) >> 12) & 0xf)*2+2)*1024*1024;
+ } else
switch(NV_READ(NV03_BOOT_0)&NV03_BOOT_0_RAM_AMOUNT)
{
case NV04_BOOT_0_RAM_AMOUNT_32MB: