diff options
| -rw-r--r-- | src/radeon_display.c | 9 | ||||
| -rw-r--r-- | src/radeon_driver.c | 11 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index a248428..3679e4f 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -1143,7 +1143,6 @@ void RADEONSetupConnectors(ScrnInfoPtr pScrn) static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, int connector) { RADEONInfoPtr info = RADEONPTR(pScrn); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); unsigned char *RADEONMMIO = info->MMIO; if (info->IsMobility) { @@ -1170,7 +1169,6 @@ static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, int connector) /* Secondary Head (mostly VGA, can be DVI on some OEM boards)*/ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, int connector) { - RADEONInfoPtr info = RADEONPTR(pScrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONConnector *pPort = pRADEONEnt->PortInfo[connector]; @@ -1189,7 +1187,6 @@ static void RADEONQueryConnectedDisplays(ScrnInfoPtr pScrn) RADEONInfoPtr info = RADEONPTR(pScrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - unsigned char *RADEONMMIO = info->MMIO; const char *s; Bool ignore_edid = FALSE; @@ -2010,7 +2007,6 @@ static void RADEONBlankSet(ScrnInfoPtr pScrn, RADEONConnector *pPort) { RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); switch(pPort->MonType) { case MT_LCD: @@ -2093,7 +2089,6 @@ static void RADEONUnblankSet(ScrnInfoPtr pScrn, RADEONConnector *pPort) { RADEONInfoPtr info = RADEONPTR (pScrn); unsigned char *RADEONMMIO = info->MMIO; - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); switch(pPort->MonType) { case MT_LCD: @@ -2161,7 +2156,6 @@ void RADEONUnblank(ScrnInfoPtr pScrn) static void RADEONDPMSSetOn(ScrnInfoPtr pScrn, RADEONConnector *pPort) { RADEONInfoPtr info = RADEONPTR(pScrn); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); unsigned char *RADEONMMIO = info->MMIO; RADEONMonitorType MonType; RADEONTmdsType TmdsType; @@ -2199,7 +2193,6 @@ static void RADEONDPMSSetOn(ScrnInfoPtr pScrn, RADEONConnector *pPort) static void RADEONDPMSSetOff(ScrnInfoPtr pScrn, RADEONConnector *pPort) { RADEONInfoPtr info = RADEONPTR(pScrn); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); unsigned char *RADEONMMIO = info->MMIO; RADEONMonitorType MonType; RADEONTmdsType TmdsType; @@ -2358,7 +2351,6 @@ void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn, Bool RADEONAllocateControllers(ScrnInfoPtr pScrn) { RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - int num_crtc; if (pRADEONEnt->Controller[0]) return TRUE; @@ -2383,7 +2375,6 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn) Bool RADEONAllocateConnectors(ScrnInfoPtr pScrn) { RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - int num_connectors; int i; if (pRADEONEnt->PortInfo[0]) diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 0ba4427..f529629 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -816,7 +816,6 @@ static int RADEONDiv(int n, int d) static Bool RADEONProbePLLParameters(ScrnInfoPtr pScrn) { RADEONInfoPtr info = RADEONPTR(pScrn); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONPLLPtr pll = &info->pll; unsigned char *RADEONMMIO = info->MMIO; unsigned char ppll_div_sel; @@ -5846,7 +5845,6 @@ static Bool RADEONInitCrtcRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save, int hsync_wid; int vsync_wid; RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - RADEONConnector *connector; pRADEONEnt->Controller[0]->IsUsed = TRUE; pRADEONEnt->Controller[0]->IsActive = TRUE; @@ -7014,7 +7012,6 @@ static void RADEONGetMergedFBOptions(ScrnInfoPtr pScrn) { RADEONInfoPtr info = RADEONPTR(pScrn); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONConnector *connector; char *strptr; char *default_hsync = "28-33"; @@ -7213,10 +7210,10 @@ RADEONGetMergedFBOptions(ScrnInfoPtr pScrn) } /* xf86SetDDCproperties(info->CRT2pScrn, pRADEONEnt->MonInfo2); */ - if (connector = RADEONGetCrtcConnector(pScrn, 2)) - info->CRT2pScrn->monitor->DDC = connector->MonInfo; - else - info->CRT2pScrn->monitor->DDC = NULL; + + connector = RADEONGetCrtcConnector(pScrn, 2); + info->CRT2pScrn->monitor->DDC = connector ? connector->MonInfo : NULL; + if (default_range) { RADEONStrToRanges(info->CRT2pScrn->monitor->hsync, default_hsync, MAX_HSYNC); RADEONStrToRanges(info->CRT2pScrn->monitor->vrefresh, default_vrefresh, MAX_VREFRESH); |