diff options
Diffstat (limited to 'src/nv_driver.c')
| -rw-r--r-- | src/nv_driver.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c index cb018be..ef9efc6 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -33,6 +33,8 @@ #include "xf86drm.h" +extern DisplayModePtr xf86ModesAdd(DisplayModePtr Modes, DisplayModePtr Additions); + /*const OptionInfoRec * RivaAvailableOptions(int chipid, int busid); Bool RivaGetScrnInfoRec(PciChipsets *chips, int chip);*/ @@ -1782,9 +1784,8 @@ NVMapMem(ScrnInfoPtr pScrn) return FALSE; } xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Allocated %dMiB VRAM for framebuffer + offscreen pixmaps at %08X\n", - pNv->FB->size >> 20, pNv->FB->offset - ); + "Allocated %dMiB VRAM for framebuffer + offscreen pixmaps\n", + (unsigned int)(pNv->FB->size >> 20)); /*XXX: have to get these after we've allocated something, otherwise * they're uninitialised in the DRM! @@ -1797,8 +1798,9 @@ NVMapMem(ScrnInfoPtr pScrn) if (pNv->AGPSize) { int gart_scratch_size; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "AGP: %dMiB available\n", - (unsigned int)pNv->AGPSize >> 20); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "GART: %dMiB available\n", + (unsigned int)(pNv->AGPSize >> 20)); if (pNv->AGPSize > (16*1024*1024)) gart_scratch_size = 16*1024*1024; @@ -1807,14 +1809,15 @@ NVMapMem(ScrnInfoPtr pScrn) pNv->AGPScratch = NVAllocateMemory(pNv, NOUVEAU_MEM_AGP, gart_scratch_size); - if (!pNv->AGPScratch) + if (!pNv->AGPScratch) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Unable to allocate AGP memory\n"); - else + "Unable to allocate GART memory\n"); + } else { xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "AGP: mapped %dMiB at %p\n", - (unsigned int)pNv->AGPScratch->size>>20, - pNv->AGPScratch->map); + "GART: mapped %dMiB at %p\n", + (unsigned int)(pNv->AGPScratch->size >> 20), + pNv->AGPScratch->map); + } } pNv->Cursor = NVAllocateMemory(pNv, NOUVEAU_MEM_FB, 64*1024); |