XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support configs with BAR1 < total RAM < 256 MB.

Browse Source
This commit is contained in:
Aaron Plattner
2007-06-30 21:51:15 -07:00
parent 209c84e788
commit 63eb1a4aa4
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/g80_driver.c
View File

@@ -194,6 +194,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
const Gamma gzeros = {0.0, 0.0, 0.0};
char *s;
CARD32 tmp;
memType BAR1sizeKB;
if(flags & PROBE_DETECT) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -341,18 +342,35 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
pNv->architecture = pNv->reg[0] >> 20 & 0x1ff;
pNv->RamAmountKBytes = pNv->RamAmountKBytes = (pNv->reg[0x0010020C/4] & 0xFFF00000) >> 10;
pNv->videoRam = pNv->RamAmountKBytes;
/* Limit videoRam to the max BAR1 size of 256MB */
if(pNv->videoRam <= 1024) {
/* Determine the size of BAR1 */
/* Some configs have BAR1 < total RAM < 256 MB */
BAR1sizeKB = 1UL << (pPci->size[1] - 10);
if(BAR1sizeKB > 256 * 1024) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "BAR1 is > 256 MB, which is "
"probably wrong. Clamping to 256 MB.\n");
BAR1sizeKB = 256 * 1024;
}
/* Limit videoRam to the size of BAR1 */
if(pNv->videoRam <= 1024 || BAR1sizeKB == 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to determine the amount of "
"available video memory\n");
goto fail;
}
pNv->videoRam -= 1024;
if(pNv->videoRam > 256 * 1024)
pNv->videoRam = 256 * 1024;
if(pNv->videoRam > BAR1sizeKB)
pNv->videoRam = BAR1sizeKB;
pScrn->videoRam = pNv->videoRam;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Mapping %.1f of %.1f MB of video RAM\n",
pScrn->videoRam / 1024.0, pNv->RamAmountKBytes / 1024.0);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Total video RAM: %.1f MB\n",
pNv->RamAmountKBytes / 1024.0);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " BAR1 size: %.1f MB\n",
BAR1sizeKB / 1024.0);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " Mapped memory: %.1f MB\n",
pScrn->videoRam / 1024.0);
pNv->mem = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,
pcitag, pPci->memBase[1], pScrn->videoRam * 1024);