diff options
| author | Arkadiusz Miskiewicz <arekm@maven.pl> | 2007-12-18 15:29:53 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-12-18 15:29:53 -0500 |
| commit | 1496194200adbcb044ec3977367a0908262e389c (patch) | |
| tree | 5a0aee7cabb67f2d94f9d90a261e9ef3f61354d1 | |
| parent | 44d07c4ccce9acb5bd21a17acb082e91f7225764 (diff) | |
RADEON: driver cleanups, warning fixes
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/radeon_accel.c | 6 | ||||
| -rw-r--r-- | src/radeon_commonfuncs.c | 4 | ||||
| -rw-r--r-- | src/radeon_display.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index b3d46a5..1570e54 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], AC_ARG_ENABLE(exa, AC_HELP_STRING([--disable-exa], - [Disable EXA support [[default enabled]]]), + [Disable EXA support [[default=enabled]]]), [EXA="$enableval"], [EXA=yes]) diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 6028aff..ed7d1e9 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -136,8 +136,8 @@ void RADEONWaitForFifoFunction(ScrnInfoPtr pScrn, int entries) } xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "FIFO timed out: %u entries, stat=0x%08x\n", - INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, - INREG(RADEON_RBBM_STATUS)); + (unsigned int)INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, + (unsigned int)INREG(RADEON_RBBM_STATUS)); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "FIFO timed out, resetting engine...\n"); RADEONEngineReset(pScrn); @@ -168,7 +168,7 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn) if (i == RADEON_TIMEOUT) { xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "DC flush timeout: %x\n", - INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)); + (unsigned int)INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)); } } diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index 6a999af..a1802f8 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -174,8 +174,8 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn) } xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Idle timed out: %u entries, stat=0x%08x\n", - INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, - INREG(RADEON_RBBM_STATUS)); + (unsigned int)INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, + (unsigned int)INREG(RADEON_RBBM_STATUS)); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Idle timed out, resetting engine...\n"); RADEONEngineReset(pScrn); diff --git a/src/radeon_display.c b/src/radeon_display.c index 6bbd315..ea31a82 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -743,7 +743,7 @@ void RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_b xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "GRPH_BUFFER_CNTL from %x to %x\n", (unsigned int)info->SavedReg.grph_buffer_cntl, - INREG(RADEON_GRPH_BUFFER_CNTL)); + (unsigned int)INREG(RADEON_GRPH_BUFFER_CNTL)); if (mode2) { stop_req = mode2->HDisplay * pixel_bytes2 / 16; @@ -793,7 +793,7 @@ void RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_b xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "GRPH2_BUFFER_CNTL from %x to %x\n", (unsigned int)info->SavedReg.grph2_buffer_cntl, - INREG(RADEON_GRPH2_BUFFER_CNTL)); + (unsigned int)INREG(RADEON_GRPH2_BUFFER_CNTL)); } } |