diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-08-15 07:30:05 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2005-08-15 07:30:05 +0000 |
| commit | 461d43be78f49e6cb965b7a206c77f6fe1622601 (patch) | |
| tree | 36a337d96e71a3beb22a6a1fc7f9049f4508e601 | |
| parent | 95bd8dbee69b4b35e4c37e19d15e0449c38726b6 (diff) | |
| download | xorg-driver-xf86-video-intel-461d43be78f49e6cb965b7a206c77f6fe1622601.tar.gz | |
Egbert's 64bit fixes for mixed 32/64bit clients
| -rw-r--r-- | src/i810_dri.c | 8 | ||||
| -rw-r--r-- | src/i830_dri.c | 10 | ||||
| -rw-r--r-- | src/i830_memory.c | 7 |
3 files changed, 13 insertions, 12 deletions
diff --git a/src/i810_dri.c b/src/i810_dri.c index 9aaab8cd..635395db 100644 --- a/src/i810_dri.c +++ b/src/i810_dri.c @@ -290,8 +290,8 @@ I810DRIScreenInit(ScreenPtr pScreen) DRIInfoPtr pDRIInfo; I810DRIPtr pI810DRI; unsigned long tom; - unsigned long agpHandle; - unsigned long dcacheHandle; + drm_handle_t agpHandle; + drm_handle_t dcacheHandle; int sysmem_size = 0; int back_size = 0; unsigned int pitch_idx = 0; @@ -492,7 +492,7 @@ I810DRIScreenInit(ScreenPtr pScreen) DRICloseScreen(pScreen); return FALSE; } - xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08lx\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n", pI810DRI->regs); pI810->backHandle = DRM_AGP_NO_HANDLE; @@ -531,7 +531,7 @@ I810DRIScreenInit(ScreenPtr pScreen) drmAgpAlloc(pI810->drmSubFD, 4096 * 1024, 1, NULL, &dcacheHandle); pI810->dcacheHandle = dcacheHandle; - xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] dcacheHandle : 0x%lx\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] dcacheHandle : 0x%x\n", dcacheHandle); #define Elements(x) sizeof(x)/sizeof(*x) diff --git a/src/i830_dri.c b/src/i830_dri.c index db6da3af..87b6a335 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -622,7 +622,7 @@ I830DRIDoMappings(ScreenPtr pScreen) DRICloseScreen(pScreen); return FALSE; } - xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08lx\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n", pI830DRI->regs); /* @@ -642,7 +642,7 @@ I830DRIDoMappings(ScreenPtr pScreen) DRICloseScreen(pScreen); return FALSE; } - xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Back Buffer = 0x%08lx\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Back Buffer = 0x%08x\n", pI830DRI->backbuffer); pI830DRI->depthbufferSize = pI830->DepthBuffer.Size; @@ -655,7 +655,7 @@ I830DRIDoMappings(ScreenPtr pScreen) DRICloseScreen(pScreen); return FALSE; } - xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Depth Buffer = 0x%08lx\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Depth Buffer = 0x%08x\n", pI830DRI->depthbuffer); @@ -668,7 +668,7 @@ I830DRIDoMappings(ScreenPtr pScreen) DRICloseScreen(pScreen); return FALSE; } - xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] ring buffer = 0x%08lx\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] ring buffer = 0x%08x\n", pI830->ring_map); pI830DRI->textureSize = pI830->TexMem.Size; @@ -683,7 +683,7 @@ I830DRIDoMappings(ScreenPtr pScreen) DRICloseScreen(pScreen); return FALSE; } - xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] textures = 0x%08lx\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] textures = 0x%08x\n", pI830DRI->textures); if (!I830InitDma(pScrn)) { diff --git a/src/i830_memory.c b/src/i830_memory.c index fd95d0fc..27cf0178 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1617,7 +1617,7 @@ long I830CheckAvailableMemory(ScrnInfoPtr pScrn) { AgpInfoPtr agpinf; - int maxPages; + long maxPages; if (!xf86AgpGARTSupported() || !xf86AcquireGART(pScrn->scrnIndex) || @@ -1626,8 +1626,9 @@ I830CheckAvailableMemory(ScrnInfoPtr pScrn) return -1; maxPages = agpinf->totalPages - agpinf->usedPages; - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "%s: %d kB available\n", - "I830CheckAvailableMemory", maxPages * 4); + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, + "Checking Available AGP Memory: %ld kB available (total %ld kB, used %ld kB)\n", + maxPages * 4, agpinf->totalPages * 4, agpinf->usedPages * 4); return maxPages * 4; } |