diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-06-19 14:37:01 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2009-06-19 14:37:01 +0200 |
| commit | 496adc4dc7cf53fc6acfecb1158f1491d5f36168 (patch) | |
| tree | d4cd85f4ddf4860908e86b7deb9b53ac35fead79 | |
| parent | ab20ea1530ec8a3a9fd4089775c4e157e50fe1bf (diff) | |
Revert "Build fixes for -Werror that aren't ready for prime time yet."
This reverts commit ab20ea1530ec8a3a9fd4089775c4e157e50fe1bf.
Whoops, pushed wrong branch...
| -rw-r--r-- | src/radeon_dga.c | 4 | ||||
| -rw-r--r-- | src/radeon_dri.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_dga.c b/src/radeon_dga.c index d61c2cea..6b0fabea 100644 --- a/src/radeon_dga.c +++ b/src/radeon_dga.c @@ -161,7 +161,7 @@ SECOND_PASS: currentMode->yViewportStep = 1; currentMode->viewportFlags = DGA_FLIP_RETRACE; currentMode->offset = 0; - currentMode->address = (unsigned char*)(unsigned long)info->LinearAddr; + currentMode->address = (unsigned char*)info->LinearAddr; currentMode->bytesPerScanline = pitch * Bpp; currentMode->imageWidth = pitch; currentMode->imageHeight = (info->FbMapSize @@ -457,7 +457,7 @@ static Bool RADEON_OpenFramebuffer(ScrnInfoPtr pScrn, RADEONInfoPtr info = RADEONPTR(pScrn); *name = NULL; /* no special device */ - *mem = (unsigned char*)(unsigned long)info->LinearAddr; + *mem = (unsigned char*)info->LinearAddr; *size = info->FbMapSize; *offset = 0; *flags = 0; /* DGA_NEED_ROOT; -- don't need root, just /dev/mem access */ diff --git a/src/radeon_dri.c b/src/radeon_dri.c index cfa5f588..19f7abec 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -1578,7 +1578,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) pDRIInfo->ddxDriverMajorVersion = info->allowColorTiling ? 5 : 4; pDRIInfo->ddxDriverMinorVersion = 3; pDRIInfo->ddxDriverPatchVersion = 0; - pDRIInfo->frameBufferPhysicalAddress = (void *)(unsigned long)info->LinearAddr + info->dri->frontOffset; + pDRIInfo->frameBufferPhysicalAddress = (void *)info->LinearAddr + info->dri->frontOffset; pDRIInfo->frameBufferSize = info->FbMapSize - info->FbSecureSize; pDRIInfo->frameBufferStride = (pScrn->displayWidth * info->CurrentLayout.pixel_bytes); |