xf86-video-ati: Branch 'master' - 2 commits
Dave Airlie
airlied at kemper.freedesktop.org
Thu Jun 15 14:26:34 EEST 2006
src/r128_dri.c | 14 +++++++-------
src/radeon_dri.c | 6 +++---
src/radeon_driver.c | 51 +++++++++++++++++++++++++--------------------------
3 files changed, 35 insertions(+), 36 deletions(-)
New commits:
diff-tree 6ca986242c80bcfe7ca2d435a772bbdf034892c4 (from 9a5f5bc0d3f5e62b79355993ca6246382394daee)
Author: Dave Airlie <airlied at linux.ie>
Date: Thu Jun 15 21:24:46 2006 +1000
remove unused variable
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 6c2936d..b6ce998 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2418,7 +2418,6 @@ static void RADEONGetVRamType(ScrnInfoPt
static CARD32 RADEONGetAccessibleVRAM(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
- EntityInfoPtr pEnt = info->pEnt;
unsigned char *RADEONMMIO = info->MMIO;
CARD32 aper_size = INREG(RADEON_CONFIG_APER_SIZE) / 1024;
diff-tree 9a5f5bc0d3f5e62b79355993ca6246382394daee (from dfac8191dbda29ef7f6ce33d7356fee89c17d59b)
Author: Dave Airlie <airlied at linux.ie>
Date: Thu Jun 15 21:24:16 2006 +1000
remove all printf specifier warnings on Linux
diff --git a/src/r128_dri.c b/src/r128_dri.c
index 62e53a4..73c67e5 100644
--- a/src/r128_dri.c
+++ b/src/r128_dri.c
@@ -489,7 +489,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[agp] %d kB allocated with handle 0x%08lx\n",
+ "[agp] %d kB allocated with handle 0x%08x\n",
info->agpSize*1024, info->agpMemHandle);
if (drmAgpBind(info->drmFD, info->agpMemHandle, info->agpOffset) < 0) {
@@ -567,7 +567,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[agp] vertex/indirect buffers handle = 0x%08lx\n",
+ "[agp] vertex/indirect buffers handle = 0x%08x\n",
info->bufHandle);
if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
@@ -587,7 +587,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[agp] AGP texture map handle = 0x%08lx\n",
+ "[agp] AGP texture map handle = 0x%08x\n",
info->agpTexHandle);
if (drmMap(info->drmFD, info->agpTexHandle, info->agpTexMapSize,
@@ -649,7 +649,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[pci] %d kB allocated with handle 0x%08lx\n",
+ "[pci] %d kB allocated with handle 0x%08x\n",
info->agpSize*1024, info->pciMemHandle);
/* Initialize the CCE ring buffer data */
@@ -673,7 +673,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[pci] ring handle = 0x%08lx\n", info->ringHandle);
+ "[pci] ring handle = 0x%08x\n", info->ringHandle);
if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
(drmAddressPtr)&info->ring) < 0) {
@@ -694,7 +694,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[pci] ring read ptr handle = 0x%08lx\n",
+ "[pci] ring read ptr handle = 0x%08x\n",
info->ringReadPtrHandle);
if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
@@ -717,7 +717,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[pci] vertex/indirect buffers handle = 0x%08lx\n",
+ "[pci] vertex/indirect buffers handle = 0x%08x\n",
info->bufHandle);
if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index d7c4569..3e789f9 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -816,7 +816,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoP
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[agp] %d kB allocated with handle 0x%08lx\n",
+ "[agp] %d kB allocated with handle 0x%08x\n",
info->gartSize*1024, info->agpMemHandle);
if (drmAgpBind(info->drmFD,
@@ -925,7 +925,7 @@ static Bool RADEONDRIPciInit(RADEONInfoP
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[pci] %d kB allocated with handle 0x%08lx\n",
+ "[pci] %d kB allocated with handle 0x%08x\n",
info->gartSize*1024, info->pciMemHandle);
RADEONDRIInitGARTValues(info);
@@ -1032,7 +1032,7 @@ static Bool RADEONDRIMapInit(RADEONInfoP
return FALSE;
}
xf86DrvMsg(pScreen->myNum, X_INFO,
- "[drm] register handle = 0x%08lx\n", info->registerHandle);
+ "[drm] register handle = 0x%08x\n", info->registerHandle);
return TRUE;
}
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 82d7383..6c2936d 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -745,7 +745,7 @@ static Bool RADEONMapFB(ScrnInfoPtr pScr
if (info->FBDev) {
info->FB = fbdevHWMapVidmem(pScrn);
} else {
- RADEONTRACE(("Map: 0x%08x, 0x%08x\n", info->LinearAddr, info->FbMapSize));
+ RADEONTRACE(("Map: 0x%08lx, 0x%08lx\n", info->LinearAddr, info->FbMapSize));
info->FB = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_FRAMEBUFFER,
info->PciTag,
@@ -2430,7 +2430,7 @@ static CARD32 RADEONGetAccessibleVRAM(Sc
if (info->directRenderingEnabled &&
info->pKernelDRMVersion->version_minor < 23) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "[dri] limiting video memory to one aperture of %dK\n",
+ "[dri] limiting video memory to one aperture of %ldK\n",
aper_size);
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"[dri] detected radeon kernel module version 1.%d but"
@@ -2521,8 +2521,8 @@ static Bool RADEONPreInitVRAM(ScrnInfoPt
accessible = bar_size;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Detected total video RAM=%dK, accessible=%dK "
- "(PCI BAR=%dK)\n",
+ "Detected total video RAM=%dK, accessible=%ldK "
+ "(PCI BAR=%ldK)\n",
pScrn->videoRam, accessible, bar_size);
if (pScrn->videoRam > accessible)
pScrn->videoRam = accessible;
@@ -4857,7 +4857,7 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr
goto fail1;
}
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "MMIO registers at 0x%08lx: size %dKB\n", info->MMIOAddr, info->MMIOSize / 1024);
+ "MMIO registers at 0x%08lx: size %ldKB\n", info->MMIOAddr, info->MMIOSize / 1024);
if(!RADEONMapMMIO(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -5608,7 +5608,7 @@ Bool RADEONSetupMemXAA_DRI(int scrnIndex
info->depthOffset);
if (info->cardType==CARD_PCIE)
xf86DrvMsg(scrnIndex, X_INFO,
- "Will use %d kb for PCI GART table at offset 0x%x\n",
+ "Will use %d kb for PCI GART table at offset 0x%lx\n",
info->pciGartSize/1024, info->pciGartOffset);
xf86DrvMsg(scrnIndex, X_INFO,
"Will use %d kb for textures at offset 0x%x\n",
@@ -5700,7 +5700,7 @@ _X_EXPORT Bool RADEONScreenInit(int scrn
char* s;
#endif
- RADEONTRACE(("RADEONScreenInit %x %d\n",
+ RADEONTRACE(("RADEONScreenInit %lx %ld\n",
pScrn->memPhysBase, pScrn->fbOffset));
info->accelOn = FALSE;
@@ -5928,7 +5928,7 @@ _X_EXPORT Bool RADEONScreenInit(int scrn
&(info->textureSize))) {
if (info->textureSize < 0 || info->textureSize > 100) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Illegal texture memory percentage: %dx, setting to default 50%\n",
+ "Illegal texture memory percentage: %dx, setting to default 50%%\n",
info->textureSize);
info->textureSize = 50;
}
@@ -6154,7 +6154,7 @@ static void RADEONRestoreMemMapRegisters
{
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
- int i, timeout;
+ int timeout;
RADEONTRACE(("RADEONRestoreMemMapRegisters() : \n"));
RADEONTRACE((" MC_FB_LOCATION : 0x%08lx\n", restore->mc_fb_location));
@@ -6218,7 +6218,7 @@ static void RADEONRestoreMemMapRegisters
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Timeout trying to update memory controller settings !\n");
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "MC_STATUS = 0x%08x (on entry = 0x%08x)\n",
+ "MC_STATUS = 0x%08lx (on entry = 0x%08lx)\n",
INREG(RADEON_MC_STATUS), old_mc_status);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"You will probably crash now ... \n");
@@ -6400,7 +6400,7 @@ static void RADEONRestoreCrtcRegisters(S
RADEONInfoPtr info = RADEONPTR(pScrn);
unsigned char *RADEONMMIO = info->MMIO;
- RADEONTRACE(("Programming CRTC1, offset: 0x%08x\n",
+ RADEONTRACE(("Programming CRTC1, offset: 0x%08lx\n",
restore->crtc_offset));
/* We prevent the CRTC from hitting the memory controller until
@@ -6448,7 +6448,7 @@ static void RADEONRestoreCrtc2Registers(
unsigned char *RADEONMMIO = info->MMIO;
CARD32 crtc2_gen_cntl;
- RADEONTRACE(("Programming CRTC2, offset: 0x%08x\n",
+ RADEONTRACE(("Programming CRTC2, offset: 0x%08lx\n",
restore->crtc2_offset));
crtc2_gen_cntl = INREG(RADEON_CRTC2_GEN_CNTL) &
@@ -6693,7 +6693,7 @@ static void RADEONRestorePLLRegisters(Sc
| RADEON_PPLL_ATOMIC_UPDATE_EN
| RADEON_PPLL_VGA_ATOMIC_UPDATE_EN));
- RADEONTRACE(("Wrote: 0x%08x 0x%08x 0x%08x (0x%08x)\n",
+ RADEONTRACE(("Wrote: 0x%08x 0x%08x 0x%08lx (0x%08x)\n",
restore->ppll_ref_div,
restore->ppll_div_3,
restore->htotal_cntl,
@@ -6752,12 +6752,12 @@ static void RADEONRestorePLL2Registers(S
| RADEON_P2PLL_ATOMIC_UPDATE_EN
| RADEON_P2PLL_VGA_ATOMIC_UPDATE_EN));
- RADEONTRACE(("Wrote: 0x%08x 0x%08x 0x%08x (0x%08x)\n",
+ RADEONTRACE(("Wrote: 0x%08lx 0x%08lx 0x%08lx (0x%08x)\n",
restore->p2pll_ref_div,
restore->p2pll_div_0,
restore->htotal_cntl2,
INPLL(pScrn, RADEON_P2PLL_CNTL)));
- RADEONTRACE(("Wrote: rd=%d, fd=%d, pd=%d\n",
+ RADEONTRACE(("Wrote: rd=%ld, fd=%ld, pd=%ld\n",
restore->p2pll_ref_div & RADEON_P2PLL_REF_DIV_MASK,
restore->p2pll_div_0 & RADEON_P2PLL_FB0_DIV_MASK,
(restore->p2pll_div_0 & RADEON_P2PLL_POST0_DIV_MASK) >>16));
@@ -7190,7 +7190,7 @@ static void RADEONSavePLLRegisters(ScrnI
save->ppll_div_3 = INPLL(pScrn, RADEON_PPLL_DIV_3);
save->htotal_cntl = INPLL(pScrn, RADEON_HTOTAL_CNTL);
- RADEONTRACE(("Read: 0x%08x 0x%08x 0x%08x\n",
+ RADEONTRACE(("Read: 0x%08x 0x%08x 0x%08lx\n",
save->ppll_ref_div,
save->ppll_div_3,
save->htotal_cntl));
@@ -7207,11 +7207,11 @@ static void RADEONSavePLL2Registers(Scrn
save->p2pll_div_0 = INPLL(pScrn, RADEON_P2PLL_DIV_0);
save->htotal_cntl2 = INPLL(pScrn, RADEON_HTOTAL2_CNTL);
- RADEONTRACE(("Read: 0x%08x 0x%08x 0x%08x\n",
+ RADEONTRACE(("Read: 0x%08lx 0x%08lx 0x%08lx\n",
save->p2pll_ref_div,
save->p2pll_div_0,
save->htotal_cntl2));
- RADEONTRACE(("Read: rd=%d, fd=%d, pd=%d\n",
+ RADEONTRACE(("Read: rd=%ld, fd=%ld, pd=%ld\n",
save->p2pll_ref_div & RADEON_P2PLL_REF_DIV_MASK,
save->p2pll_div_0 & RADEON_P2PLL_FB0_DIV_MASK,
(save->p2pll_div_0 & RADEON_P2PLL_POST0_DIV_MASK) >> 16));
@@ -7693,7 +7693,7 @@ static void RADEONInitDispBandwidth(Scrn
OUTREG(RADEON_GRPH_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
(critical_point << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
- RADEONTRACE(("GRPH_BUFFER_CNTL from %x to %x\n",
+ RADEONTRACE(("GRPH_BUFFER_CNTL from %lx to %lx\n",
info->SavedReg.grph_buffer_cntl, INREG(RADEON_GRPH_BUFFER_CNTL)));
if (mode2) {
@@ -7741,7 +7741,7 @@ static void RADEONInitDispBandwidth(Scrn
OUTREG(RADEON_GRPH2_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
(critical_point2 << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
- RADEONTRACE(("GRPH2_BUFFER_CNTL from %x to %x\n",
+ RADEONTRACE(("GRPH2_BUFFER_CNTL from %lx to %lx\n",
info->SavedReg.grph2_buffer_cntl, INREG(RADEON_GRPH2_BUFFER_CNTL)));
}
}
@@ -7934,7 +7934,7 @@ static Bool RADEONInitCrtcRegisters(Scrn
save->tv_dac_cntl |= (0x03 | (2<<8) | (0x58<<16));
}
- RADEONTRACE(("Pitch = %d bytes (virtualX = %d, displayWidth = %d)\n",
+ RADEONTRACE(("Pitch = %ld bytes (virtualX = %d, displayWidth = %d)\n",
save->crtc_pitch, pScrn->virtualX,
info->CurrentLayout.displayWidth));
return TRUE;
@@ -8139,7 +8139,7 @@ static Bool RADEONInitCrtc2Registers(Scr
}
#endif
- RADEONTRACE(("Pitch = %d bytes (virtualX = %d, displayWidth = %d)\n",
+ RADEONTRACE(("Pitch = %ld bytes (virtualX = %d, displayWidth = %d)\n",
save->crtc2_pitch, pScrn->virtualX,
info->CurrentLayout.displayWidth));
@@ -8312,7 +8312,7 @@ static void RADEONInitFPRegisters(ScrnIn
save->tmds_pll_cntl = (orig->tmds_pll_cntl & 0xfff00000) | tmp;
} else save->tmds_pll_cntl = tmp;
- RADEONTRACE(("TMDS_PLL from %x to %x\n",
+ RADEONTRACE(("TMDS_PLL from %lx to %lx\n",
orig->tmds_pll_cntl,
save->tmds_pll_cntl));
@@ -8444,7 +8444,7 @@ static void RADEONInitPLLRegisters(ScrnI
pll->reference_freq);
save->post_div = post_div->divider;
- RADEONTRACE(("dc=%d, of=%d, fd=%d, pd=%d\n",
+ RADEONTRACE(("dc=%ld, of=%ld, fd=%d, pd=%d\n",
save->dot_clock_freq,
save->pll_output_freq,
save->feedback_div,
@@ -8506,7 +8506,7 @@ static void RADEONInitPLL2Registers(Scrn
pll->reference_freq);
save->post_div_2 = post_div->divider;
- RADEONTRACE(("dc=%d, of=%d, fd=%d, pd=%d\n",
+ RADEONTRACE(("dc=%ld, of=%ld, fd=%d, pd=%d\n",
save->dot_clock_freq_2,
save->pll_output_freq_2,
save->feedback_div_2,
More information about the xorg-commit
mailing list