summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Glisse <glisse@localhost.localdomain>2007-08-20 16:12:28 +0200
committerJerome Glisse <glisse@localhost.localdomain>2007-08-20 16:12:28 +0200
commitf1ce0eaf4b67ef841a608b02b4c031b532d17490 (patch)
treedee376d2bd7aeac2d29c26a1d20e59c449daf901
parent6028dd93092d586081dbc7ede349fdfadedc8e37 (diff)
avivo: avoid mapping more than 256Mo of video ram.
This use temporary fix, the correct solution is to get pci aperture size and only map this.
-rw-r--r--xorg/avivo.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg/avivo.c b/xorg/avivo.c
index ad8075c..98d3fd4 100644
--- a/xorg/avivo.c
+++ b/xorg/avivo.c
@@ -398,6 +398,10 @@ avivo_preinit(ScrnInfoPtr screen_info, int flags)
if (avivo->pci_info->size[i] >= 26) {
avivo->fb_addr = avivo->pci_info->memBase[i] & 0xfe000000;
avivo->fb_size = INREG(RADEON_CONFIG_MEMSIZE);
+ /* FIXME: we can't map more than 256Mo better solution would be
+ * to get aperture size */
+ if (avivo->fb_size > 0x10000000)
+ avivo->fb_size = 0x10000000;
screen_info->videoRam = avivo->fb_size / 1024;
avivo_map_fb_mem(screen_info);
}