diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2006-11-14 04:52:08 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2006-11-14 04:52:08 +1100 |
| commit | 35bf8fb5cf8ab4d4e055cdef26531d86dbf822dc (patch) | |
| tree | eede4e98bbb6c8c1b31df6f877ef1ea2c3adfc28 /shared-core | |
| parent | 9ef4bbc66c1b055b4450ea9354945d784751cef7 (diff) | |
| parent | 1123ab089075af3141c794696ec394fa46b4353f (diff) | |
Merge branch 'nouveau-1' of git+ssh://git.freedesktop.org/git/mesa/drm into nouveau-1
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/nouveau_mem.c | 3 |
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: |