diff options
| -rw-r--r-- | src/r128_driver.c | 2 | ||||
| -rw-r--r-- | src/radeon_dri.c | 2 | ||||
| -rw-r--r-- | src/radeon_driver.c | 8 | ||||
| -rw-r--r-- | src/radeon_mm_i2c.c | 5 |
4 files changed, 5 insertions, 12 deletions
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(ScrnInfoPtr pScrn, R128SavePtr save, 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 pScrn) 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 pScreen) 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(ScrnInfoPtr pScrn) { 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(ScrnInfoPtr pScrn) 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(ScrnInfoPtr pScrn) { 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 pScrn, int x, int y, int clone) { 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 pScrn) 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 d, I2CByte *WriteBuffer, int nWrite, return TRUE; } +#if 0 static Bool RADEONProbeAddress(I2CBusPtr b, I2CSlaveAddr addr) { I2CByte a; @@ -316,6 +316,7 @@ static Bool RADEONProbeAddress(I2CBusPtr b, I2CSlaveAddr addr) return I2C_WriteRead(&d, NULL, 0, &a, 1); } +#endif #define I2C_CLOCK_FREQ (60000.0) @@ -378,8 +379,6 @@ void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) double nm; RADEONInfoPtr info = RADEONPTR(pScrn); RADEONPLLPtr pll = &(info->pll); - int i; - unsigned char *RADEONMMIO = info->MMIO; pPriv->i2c = NULL; pPriv->fi1236 = NULL; |