xf86-video-ati: Branch 'master' - 3 commits
Dave Airlie
airlied at kemper.freedesktop.org
Thu Jun 15 14:05:54 EEST 2006
src/atimode.c | 2 +-
src/r128_driver.c | 2 +-
src/radeon.h | 2 +-
src/radeon_accel.c | 4 ++--
src/radeon_commonfuncs.c | 2 +-
src/radeon_dri.c | 2 --
src/radeon_driver.c | 8 ++------
src/radeon_mm_i2c.c | 5 ++---
8 files changed, 10 insertions(+), 17 deletions(-)
New commits:
diff-tree dfac8191dbda29ef7f6ce33d7356fee89c17d59b (from 33525540f3a9d6760c6edcfe765d2a004a6b894f)
Author: Dave Airlie <airlied at linux.ie>
Date: Thu Jun 15 21:05:16 2006 +1000
fix last ati*.[ch] format specifiers
diff --git a/src/atimode.c b/src/atimode.c
index c3d5a2c..17210de 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -1000,7 +1000,7 @@ ATISetVBEMode
#endif
default:
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
- "Mode not supported for TV-Out: depth: %ld HDisplay: %ld\n",
+ "Mode not supported for TV-Out: depth: %d HDisplay: %d\n",
modekey>>16, modekey & 0xffff);
return;
}
diff-tree 33525540f3a9d6760c6edcfe765d2a004a6b894f (from 6bcf6f29af24b6725e097dd72af8e8b9f6d0676c)
Author: Dave Airlie <airlied at linux.ie>
Date: Thu Jun 15 21:03:01 2006 +1000
fix more printf formats
diff --git a/src/radeon.h b/src/radeon.h
index 78150ce..e45ade1 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 19f7bf1..4c4a0f6 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -133,7 +133,7 @@ void RADEONWaitForFifoFunction(ScrnInfoP
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 7b72004..bbf111e 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -171,7 +171,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnIn
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,
diff-tree 6bcf6f29af24b6725e097dd72af8e8b9f6d0676c (from d511ef486a15b582e5d1708a17a00701f5cf1ccd)
Author: Dave Airlie <airlied at linux.ie>
Date: Thu Jun 15 20:59:33 2006 +1000
some more unused variable cleanups
diff --git a/src/r128_driver.c b/src/r128_driver.c
index f911d20..95a9912 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -3521,7 +3521,7 @@ static Bool R128InitCrtcRegisters(ScrnIn
int vsync_wid;
int hsync_fudge_default[] = { 0x00, 0x12, 0x09, 0x09, 0x06, 0x05 };
int hsync_fudge_fp[] = { 0x12, 0x11, 0x09, 0x09, 0x05, 0x05 };
- int hsync_fudge_fp_crt[] = { 0x12, 0x10, 0x08, 0x08, 0x04, 0x04 };
+// int hsync_fudge_fp_crt[] = { 0x12, 0x10, 0x08, 0x08, 0x04, 0x04 };
switch (info->CurrentLayout.pixel_code) {
case 4: format = 1; break;
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 5b42c33..d7c4569 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1197,7 +1197,6 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pSc
int major, minor, patch, fd;
int req_minor, req_patch;
char *busId;
- drmVersionPtr libVersion;
/* Check that the GLX, DRI, and DRM modules have been loaded by testing
* for known symbols in each module.
@@ -1332,7 +1331,6 @@ Bool RADEONDRIScreenInit(ScreenPtr pScre
RADEONInfoPtr info = RADEONPTR(pScrn);
DRIInfoPtr pDRIInfo;
RADEONDRIPtr pRADEONDRI;
- drmVersionPtr version;
info->DRICloseScreen = NULL;
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index b4c3cd4..82d7383 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2301,7 +2301,7 @@ static void RADEONInitMemoryMap(ScrnInfo
{
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
- unsigned long agp_size, agp_base, mem_size;
+ unsigned long mem_size;
/* Default to existing values */
info->mc_fb_location = INREG(RADEON_MC_FB_LOCATION);
@@ -2366,8 +2366,6 @@ static void RADEONInitMemoryMap(ScrnInfo
RADEONTRACE(("RADEONInitMemoryMap() : \n"));
RADEONTRACE((" mem_size : 0x%08lx\n", mem_size));
- RADEONTRACE((" agp_size : 0x%08lx\n", agp_size));
- RADEONTRACE((" agp_base : 0x%08lx\n", agp_base));
RADEONTRACE((" MC_FB_LOCATION : 0x%08lx\n", info->mc_fb_location));
RADEONTRACE((" MC_AGP_LOCATION : 0x%08lx\n", info->mc_agp_location));
}
@@ -2421,8 +2419,6 @@ static CARD32 RADEONGetAccessibleVRAM(Sc
{
RADEONInfoPtr info = RADEONPTR(pScrn);
EntityInfoPtr pEnt = info->pEnt;
- GDevPtr dev = pEnt->device;
- MessageType from;
unsigned char *RADEONMMIO = info->MMIO;
CARD32 aper_size = INREG(RADEON_CONFIG_APER_SIZE) / 1024;
@@ -8834,7 +8830,7 @@ void RADEONDoAdjustFrame(ScrnInfoPtr pSc
{
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
- int reg, Base, regcntl, crtcoffsetcntl, xytilereg, crtcxytile;
+ int reg, Base, regcntl, crtcoffsetcntl, xytilereg, crtcxytile = 0;
#ifdef XF86DRI
RADEONSAREAPrivPtr pSAREAPriv;
XF86DRISAREAPtr pSAREA;
diff --git a/src/radeon_mm_i2c.c b/src/radeon_mm_i2c.c
index fbc2063..377c3df 100644
--- a/src/radeon_mm_i2c.c
+++ b/src/radeon_mm_i2c.c
@@ -118,7 +118,6 @@ static void RADEON_I2C_Halt (ScrnInfoPtr
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
CARD8 reg;
- long counter = 0;
/* reset status flags */
RADEONWaitForIdleMMIO(pScrn);
@@ -304,6 +303,7 @@ static Bool R200_I2CWriteRead(I2CDevPtr
return TRUE;
}
+#if 0
static Bool RADEONProbeAddress(I2CBusPtr b, I2CSlaveAddr addr)
{
I2CByte a;
@@ -316,6 +316,7 @@ static Bool RADEONProbeAddress(I2CBusPtr
return I2C_WriteRead(&d, NULL, 0, &a, 1);
}
+#endif
#define I2C_CLOCK_FREQ (60000.0)
@@ -378,8 +379,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RA
double nm;
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONPLLPtr pll = &(info->pll);
- int i;
- unsigned char *RADEONMMIO = info->MMIO;
pPriv->i2c = NULL;
pPriv->fi1236 = NULL;
More information about the xorg-commit
mailing list