From 69eca3b8340966874ee3ffdc0d0a3f73de7a816a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 10 May 2008 14:58:14 +1000 Subject: savage: fix typos in error message --- src/savage_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/savage_driver.c') diff --git a/src/savage_driver.c b/src/savage_driver.c index eb06519..5fd7d66 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -3128,7 +3128,7 @@ static Bool SavageMapMem(ScrnInfoPtr pScrn) #endif if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Internal error: cound not map framebuffer range (%d, %s).\n", + "Internal error: could not map framebuffer range (%d, %s).\n", err, strerror(err)); return FALSE; } @@ -3154,7 +3154,7 @@ static Bool SavageMapMem(ScrnInfoPtr pScrn) #endif if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Internal error: cound not map aperture range (%d, %s).\n", + "Internal error: could not map aperture range (%d, %s).\n", err, strerror(err)); return FALSE; } @@ -3179,7 +3179,7 @@ static Bool SavageMapMem(ScrnInfoPtr pScrn) #endif if (err) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Internal error: cound not map MMIO range (%d, %s).\n", + "Internal error: could not map MMIO range (%d, %s).\n", err, strerror(err)); return FALSE; } -- cgit v1.2.3 From a01c9d12938f977a4310e0547866f01517059a3e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 10 May 2008 15:06:18 +1000 Subject: savage/pciaccess: don't try to map aperture larger than region window --- src/savage_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/savage_driver.c') diff --git a/src/savage_driver.c b/src/savage_driver.c index 5fd7d66..2205dc8 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -3097,10 +3097,16 @@ static Bool SavageMapMem(ScrnInfoPtr pScrn) /* On Paramount and Savage 2000, aperture 0 is PCI base 2. On other * chipsets it's in the same BAR as the framebuffer. */ + + psav->ApertureRegion.size = (psav->IsPrimary || psav->IsSecondary) + ? (0x01000000 * 2) : (0x01000000 * 5); + if ((psav->Chipset == S3_SUPERSAVAGE) || (psav->Chipset == S3_SAVAGE2000)) { #ifdef XSERVER_LIBPCIACCESS psav->ApertureRegion.base = psav->PciInfo->regions[2].base_addr; + if (psav->ApertureRegion.size > psav->PciInfo->regions[2].size) + psav->ApertureRegion.size = psav->PciInfo->regions[2].size; #else psav->ApertureRegion.base = psav->PciInfo->memBase[2]; #endif @@ -3108,8 +3114,6 @@ static Bool SavageMapMem(ScrnInfoPtr pScrn) psav->ApertureRegion.base = psav->FbRegion.base + 0x02000000; } - psav->ApertureRegion.size = (psav->IsPrimary || psav->IsSecondary) - ? (0x01000000 * 2) : (0x01000000 * 5); if (psav->FbRegion.size != 0) { -- cgit v1.2.3