diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-06-14 16:50:07 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-06-14 16:50:07 +0200 |
| commit | ab20ea1530ec8a3a9fd4089775c4e157e50fe1bf (patch) | |
| tree | 4adba742a72ceb301b4e8c03330310e0e0c02fa4 /src | |
| parent | 77e3537d312175a25f0e21cc07c3a96f78c3b35a (diff) | |
Build fixes for -Werror that aren't ready for prime time yet.
Diffstat (limited to 'src')
| -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 6b0fabea..d61c2cea 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*)info->LinearAddr; + currentMode->address = (unsigned char*)(unsigned long)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*)info->LinearAddr; + *mem = (unsigned char*)(unsigned long)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 19f7abec..cfa5f588 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 *)info->LinearAddr + info->dri->frontOffset; + pDRIInfo->frameBufferPhysicalAddress = (void *)(unsigned long)info->LinearAddr + info->dri->frontOffset; pDRIInfo->frameBufferSize = info->FbMapSize - info->FbSecureSize; pDRIInfo->frameBufferStride = (pScrn->displayWidth * info->CurrentLayout.pixel_bytes); |