Commit 461d43be authored by Alan Hourihane's avatar Alan Hourihane

Egbert's 64bit fixes for mixed 32/64bit clients

parent 95bd8dbe
......@@ -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)
......
......@@ -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)) {
......
......@@ -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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment