summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-06-15 21:03:01 +1000
committerDave Airlie <airlied@linux.ie>2006-06-15 21:03:01 +1000
commit33525540f3a9d6760c6edcfe765d2a004a6b894f (patch)
tree7ec8919a8662d6b622f3227cf029c9e34c1a8be8 /src
parent6bcf6f29af24b6725e097dd72af8e8b9f6d0676c (diff)
fix more printf formats
Diffstat (limited to 'src')
-rw-r--r--src/radeon.h2
-rw-r--r--src/radeon_accel.c4
-rw-r--r--src/radeon_commonfuncs.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon.h b/src/radeon.h
index 78150ce2..e45ade1b 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -892,7 +892,7 @@ do { \
#define BEGIN_RING(n) do { \
if (RADEON_VERBOSE) { \
xf86DrvMsg(pScrn->scrnIndex, X_INFO, \
- "BEGIN_RING(%d) in %s\n", n, __FUNCTION__); \
+ "BEGIN_RING(%d) in %s\n", (unsigned int)n, __FUNCTION__);\
} \
if (++info->dma_begin_count != 1) { \
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, \
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 19f7bf1b..4c4a0f61 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -133,7 +133,7 @@ void RADEONWaitForFifoFunction(ScrnInfoPtr pScrn, int entries)
INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK;
if (info->fifo_slots >= entries) return;
}
- RADEONTRACE(("FIFO timed out: %d entries, stat=0x%08x\n",
+ RADEONTRACE(("FIFO timed out: %ld entries, stat=0x%08lx\n",
INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK,
INREG(RADEON_RBBM_STATUS)));
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -164,7 +164,7 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn)
break;
}
if (i == RADEON_TIMEOUT) {
- RADEONTRACE(("DC flush timeout: %x\n",
+ RADEONTRACE(("DC flush timeout: %lx\n",
INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)));
}
}
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 7b720043..bbf111e8 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -171,7 +171,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn)
return;
}
}
- RADEONTRACE(("Idle timed out: %d entries, stat=0x%08x\n",
+ RADEONTRACE(("Idle timed out: %ld entries, stat=0x%08lx\n",
INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK,
INREG(RADEON_RBBM_STATUS)));
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,