frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace cleanup.

This commit is contained in:
Eric Anholt 2004-01-25 01:04:12 +00:00
parent 6870c08157
commit 26c5a8dfdd
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/kdrive/ati/ati_dri.c
View File

@ -71,18 +71,18 @@ ATIDRIInitGARTValues(ScreenPtr pScreen)
int s, l; int s, l;
atis->gartOffset = 0; atis->gartOffset = 0;
/* Initialize the ring buffer data */ /* Initialize the ring buffer data */
atis->ringStart = atis->gartOffset; atis->ringStart = atis->gartOffset;
atis->ringMapSize = atis->ringSize*1024*1024 + DRM_PAGE_SIZE; atis->ringMapSize = atis->ringSize*1024*1024 + DRM_PAGE_SIZE;
atis->ringReadOffset = atis->ringStart + atis->ringMapSize; atis->ringReadOffset = atis->ringStart + atis->ringMapSize;
atis->ringReadMapSize = DRM_PAGE_SIZE; atis->ringReadMapSize = DRM_PAGE_SIZE;
/* Reserve space for vertex/indirect buffers */ /* Reserve space for vertex/indirect buffers */
atis->bufStart = atis->ringReadOffset + atis->ringReadMapSize; atis->bufStart = atis->ringReadOffset + atis->ringReadMapSize;
atis->bufMapSize = atis->bufSize*1024*1024; atis->bufMapSize = atis->bufSize*1024*1024;
/* Reserve the rest for GART textures */ /* Reserve the rest for GART textures */
atis->gartTexStart = atis->bufStart + atis->bufMapSize; atis->gartTexStart = atis->bufStart + atis->bufMapSize;
s = (atis->gartSize*1024*1024 - atis->gartTexStart); s = (atis->gartSize*1024*1024 - atis->gartTexStart);
@ -98,9 +98,9 @@ ATIDRIAddAndMap(int fd, drmHandle offset, drmSize size,
drmAddressPtr address, char *desc) drmAddressPtr address, char *desc)
{ {
char *name; char *name;
name = (type == DRM_AGP) ? "agp" : "pci"; name = (type == DRM_AGP) ? "agp" : "pci";
if (drmAddMap(fd, offset, size, type, flags, handle) < 0) { if (drmAddMap(fd, offset, size, type, flags, handle) < 0) {
ErrorF("[%s] Could not add %s mapping\n", name, desc); ErrorF("[%s] Could not add %s mapping\n", name, desc);
return FALSE; return FALSE;
@ -230,7 +230,7 @@ ATIDRIAgpInit(ScreenPtr pScreen)
MMIO_OUT32(mmio, R128_REG_PCI_GART_PAGE, 1); MMIO_OUT32(mmio, R128_REG_PCI_GART_PAGE, 1);
} }
return TRUE; return TRUE;
} }
static Bool static Bool
@ -254,7 +254,6 @@ ATIDRIPciInit(ScreenPtr pScreen)
ErrorF("[pci] %d kB allocated with handle 0x%08lx\n", ErrorF("[pci] %d kB allocated with handle 0x%08lx\n",
atis->gartSize*1024, (long)atis->pciMemHandle); atis->gartSize*1024, (long)atis->pciMemHandle);
if (!ATIDRIAddAndMap(atic->drmFd, atis->ringStart, atis->ringMapSize, if (!ATIDRIAddAndMap(atic->drmFd, atis->ringStart, atis->ringMapSize,
DRM_SCATTER_GATHER, DRM_READ_ONLY | DRM_LOCKED | DRM_KERNEL, DRM_SCATTER_GATHER, DRM_READ_ONLY | DRM_LOCKED | DRM_KERNEL,
&atis->ringHandle, (drmAddressPtr)&atis->ring, "ring")) &atis->ringHandle, (drmAddressPtr)&atis->ring, "ring"))
@ -392,7 +391,7 @@ ATIDRIBufInit(ScreenPtr pScreen)
ATIScreenInfo(pScreenPriv); ATIScreenInfo(pScreenPriv);
ATICardInfo(pScreenPriv); ATICardInfo(pScreenPriv);
int type, size; int type, size;
if (atic->is_radeon) if (atic->is_radeon)
size = RADEON_BUFFER_SIZE; size = RADEON_BUFFER_SIZE;
else else
@ -479,7 +478,7 @@ ATIDRIScreenInit(ScreenPtr pScreen)
DRIInfoPtr pDRIInfo; DRIInfoPtr pDRIInfo;
int devSareaSize; int devSareaSize;
drmSetVersion sv; drmSetVersion sv;
/* XXX: Disable DRI clients for unsupported depths */ /* XXX: Disable DRI clients for unsupported depths */
if (atic->is_radeon) { if (atic->is_radeon) {
@ -606,8 +605,8 @@ ATIDRIScreenInit(ScreenPtr pScreen)
} }
/* Add a map for the MMIO registers that will be accessed by any /* Add a map for the MMIO registers that will be accessed by any
* DRI-based clients. * DRI-based clients.
*/ */
atis->registerSize = RADEON_REG_SIZE(atic); atis->registerSize = RADEON_REG_SIZE(atic);
if (drmAddMap(atic->drmFd, RADEON_REG_BASE(pScreenPriv->screen->card), if (drmAddMap(atic->drmFd, RADEON_REG_BASE(pScreenPriv->screen->card),
atis->registerSize, DRM_REGISTERS, DRM_READ_ONLY, atis->registerSize, DRM_REGISTERS, DRM_READ_ONLY,
@ -745,7 +744,7 @@ RadeonDRIFinishScreenInit(ScreenPtr pScreen)
drmHeap.region = RADEON_MEM_REGION_GART; drmHeap.region = RADEON_MEM_REGION_GART;
drmHeap.start = 0; drmHeap.start = 0;
drmHeap.size = atis->gartTexMapSize; drmHeap.size = atis->gartTexMapSize;
if (drmCommandWrite(atic->drmFd, DRM_RADEON_INIT_HEAP, &drmHeap, if (drmCommandWrite(atic->drmFd, DRM_RADEON_INIT_HEAP, &drmHeap,
sizeof(drmHeap))) { sizeof(drmHeap))) {
ErrorF("[drm] Failed to initialize GART heap manager\n"); ErrorF("[drm] Failed to initialize GART heap manager\n");
@ -767,7 +766,7 @@ RadeonDRIFinishScreenInit(ScreenPtr pScreen)
pRADEONDRI->IsPCI = !atis->IsAGP; pRADEONDRI->IsPCI = !atis->IsAGP;
pRADEONDRI->AGPMode = atis->agpMode; pRADEONDRI->AGPMode = atis->agpMode;
pRADEONDRI->frontOffset = atis->frontOffset; pRADEONDRI->frontOffset = atis->frontOffset;
pRADEONDRI->frontPitch = atis->frontPitch; pRADEONDRI->frontPitch = atis->frontPitch;
pRADEONDRI->backOffset = atis->backOffset; pRADEONDRI->backOffset = atis->backOffset;
@ -777,18 +776,18 @@ RadeonDRIFinishScreenInit(ScreenPtr pScreen)
pRADEONDRI->textureOffset = atis->textureOffset; pRADEONDRI->textureOffset = atis->textureOffset;
pRADEONDRI->textureSize = atis->textureSize; pRADEONDRI->textureSize = atis->textureSize;
pRADEONDRI->log2TexGran = atis->log2TexGran; pRADEONDRI->log2TexGran = atis->log2TexGran;
pRADEONDRI->registerHandle = atis->registerHandle; pRADEONDRI->registerHandle = atis->registerHandle;
pRADEONDRI->registerSize = atis->registerSize; pRADEONDRI->registerSize = atis->registerSize;
pRADEONDRI->statusHandle = atis->ringReadPtrHandle; pRADEONDRI->statusHandle = atis->ringReadPtrHandle;
pRADEONDRI->statusSize = atis->ringReadMapSize; pRADEONDRI->statusSize = atis->ringReadMapSize;
pRADEONDRI->gartTexHandle = atis->gartTexHandle; pRADEONDRI->gartTexHandle = atis->gartTexHandle;
pRADEONDRI->gartTexMapSize = atis->gartTexMapSize; pRADEONDRI->gartTexMapSize = atis->gartTexMapSize;
pRADEONDRI->log2GARTTexGran = atis->log2GARTTexGran; pRADEONDRI->log2GARTTexGran = atis->log2GARTTexGran;
pRADEONDRI->gartTexOffset = atis->gartTexStart; pRADEONDRI->gartTexOffset = atis->gartTexStart;
pRADEONDRI->sarea_priv_offset = sizeof(XF86DRISAREARec); pRADEONDRI->sarea_priv_offset = sizeof(XF86DRISAREARec);
return TRUE; return TRUE;