summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-04-28 10:24:50 +1000
committerDave Airlie <airlied@redhat.com>2008-04-28 10:24:50 +1000
commite65e95c8c44f47ef044980f59a2549684e6c9403 (patch)
treed8f050171ecb76819de871f11e297df93fc0965c
parenta4fafa97b31bb7da01dd92236b42a418ca482992 (diff)
r128: fix bios size setting for pciaccessxf86-video-r128-6.8.0
-rw-r--r--src/r128_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 2eb9d26..8f360a1 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -488,7 +488,8 @@ static Bool R128GetBIOSParameters(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
(info->VBIOS[(v) + 3] << 24))
#ifdef XSERVER_LIBPCIACCESS
- info->VBIOS = xalloc(info->PciInfo->rom_size);
+ int size = info->PciInfo->rom_size > R128_VBIOS_SIZE ? info->PciInfo->rom_size : R128_VBIOS_SIZE;
+ info->VBIOS = xalloc(size);
#else
info->VBIOS = xalloc(R128_VBIOS_SIZE);
#endif