summaryrefslogtreecommitdiff
path: root/src/radeon_accel.c
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-12-19 11:54:50 -0500
committerAlex Deucher <alex@botch2.(none)>2007-12-19 11:54:50 -0500
commitc1b0b69cc50516c3b7e881b0eb46cb3cd2e9dce6 (patch)
treeb0880ebb435f45d4292eaf63dd69aac392eb7178 /src/radeon_accel.c
parent0e6634870d1ab38ee8c83f6bda1ba60364997853 (diff)
parentce4fa1cedec0cf56b9979dfaa12a8d3a7c643df4 (diff)
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
Diffstat (limited to 'src/radeon_accel.c')
-rw-r--r--src/radeon_accel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 6028affe..ed7d1e94 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));
}
}