remove isused and isactive

3 files changed, 2 insertions, 31 deletions

diff --git a/src/radeon_display.c b/src/radeon_display.c
index ad9ca3f9..e769e152 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -952,7 +952,6 @@ void RADEONSetupConnectors(ScrnInfoPtr pScrn)
     RADEONInfoPtr info       = RADEONPTR(pScrn);
     RADEONEntPtr pRADEONEnt  = RADEONEntPriv(pScrn);
     const char *s;
-    Bool ignore_edid = FALSE;
     int i = 0, second = 0, max_mt = 5;
 
     /* We first get the information about all connectors from BIOS.
@@ -968,10 +967,6 @@ void RADEONSetupConnectors(ScrnInfoPtr pScrn)
 	pRADEONEnt->PortInfo[i]->TMDSType = TMDS_UNKNOWN;
 	pRADEONEnt->PortInfo[i]->ConnectorType = CONNECTOR_NONE;
     }
-    pRADEONEnt->Controller[0]->IsUsed = FALSE;
-    pRADEONEnt->Controller[1]->IsUsed = FALSE;
-    pRADEONEnt->Controller[0]->IsActive = FALSE;
-    pRADEONEnt->Controller[1]->IsActive = FALSE;
 
     if (!RADEONGetConnectorInfoFromBIOS(pScrn) ||
         ((pRADEONEnt->PortInfo[0]->DDCType == 0) &&
@@ -1029,18 +1024,6 @@ void RADEONSetupConnectors(ScrnInfoPtr pScrn)
         pRADEONEnt->PortInfo[0]->DACType = DAC_PRIMARY;
     }
 
-    /* IgnoreEDID option is different from the NoDDCxx options used by DDC module
-     * When IgnoreEDID is used, monitor detection will still use DDC
-     * detection, but all EDID data will not be used in mode validation.
-     * You can use this option when you have a DDC monitor but want specify your own
-     * monitor timing parameters by using HSync, VRefresh and Modeline,
-     */
-    if (xf86GetOptValBool(info->Options, OPTION_IGNORE_EDID, &ignore_edid)) {
-        if (ignore_edid)
-            xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-                       "IgnoreEDID is specified, EDID data will be ignored\n");
-    }
-
     /*
      * MonitorLayout option takes a string for two monitors connected in following format:
      * Option "MonitorLayout" "primary-port-display, secondary-port-display"
@@ -1738,7 +1721,7 @@ void RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_b
      */
     if ((info->DispPriority == 2) && IS_R300_VARIANT) {
         CARD32 mc_init_misc_lat_timer = INREG(R300_MC_INIT_MISC_LAT_TIMER);
-	if (pRADEONEnt->Controller[1]->IsActive) {
+	if (pRADEONEnt->pCrtc[1]->enabled) {
 	    mc_init_misc_lat_timer |= 0x1100; /* display 0 and 1 */
 	} else {
 	    mc_init_misc_lat_timer |= 0x0100; /* display 0 only */
@@ -2518,7 +2501,6 @@ Bool RADEONAllocateConnectors(ScrnInfoPtr pScrn)
 	if (!pRADEONEnt->pOutput[i])
 	    return FALSE;
 	
-	
 	pRADEONEnt->pOutput[i]->driver_private = pRADEONEnt->PortInfo[i];
 	pRADEONEnt->PortInfo[i]->num = i;
 
@@ -2528,7 +2510,6 @@ Bool RADEONAllocateConnectors(ScrnInfoPtr pScrn)
 
 	pRADEONEnt->pOutput[i]->possible_clones = 0;
     }
-    
 
     return TRUE;
 }
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 9c4b509b..629fb9fe 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2401,6 +2401,7 @@ static Bool RADEONPreInitControllers(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10
     RADEONInfoPtr info       = RADEONPTR(pScrn);
     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
     int i;
+
     if (!info->IsSecondary) {
       
       if (!RADEONAllocatePortInfo(pScrn))
@@ -4691,7 +4692,6 @@ void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore)
 	    output = RADEONGetCrtcConnector(pScrn, 2);
 	    if (output) {
 		RADEONEnableDisplay(pScrn, output, TRUE);
-		pCRTC2->IsActive = TRUE;
 	    }
 	} else {
 	    RADEONRestoreMemMapRegisters(pScrn, restore);
@@ -4707,13 +4707,11 @@ void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore)
 	    output = RADEONGetCrtcConnector(pScrn, 1);
 	    if (output) {
 		RADEONEnableDisplay(pScrn, output, TRUE);
-		pCRTC1->IsActive = TRUE;
 	    }
 	    if (pCRTC2->binding == 1) {
 		output = RADEONGetCrtcConnector(pScrn, 2);
 		if (output) {
 		    RADEONEnableDisplay(pScrn, output, TRUE);
-		    pCRTC2->IsActive = TRUE;
 		}
 	    }
 	}
@@ -4731,13 +4729,11 @@ void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore)
 	output = RADEONGetCrtcConnector(pScrn, 1);
 	if (output) {
 	    RADEONEnableDisplay(pScrn, output, TRUE);
-	    pCRTC1->IsActive = TRUE;
 	}
 	if ((pCRTC2->binding == 1) || pRADEONEnt->HasSecondary) {
 	    output = RADEONGetCrtcConnector(pScrn, 2);
 	    if (output) {
 		RADEONEnableDisplay(pScrn, output, TRUE);
-		pCRTC2->IsActive = TRUE;
 	    }
 	}
     }
@@ -5453,8 +5449,6 @@ static Bool RADEONInitCrtcRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save,
     RADEONEntPtr pRADEONEnt   = RADEONEntPriv(pScrn);
     xf86OutputPtr connector;
 
-    pRADEONEnt->Controller[0]->IsUsed = TRUE;
-    pRADEONEnt->Controller[0]->IsActive = TRUE;
     pRADEONEnt->pCrtc[0]->curMode = *mode;
 
     switch (info->CurrentLayout.pixel_code) {
@@ -5643,8 +5637,6 @@ static Bool RADEONInitCrtc2Registers(ScrnInfoPtr pScrn, RADEONSavePtr save,
     if (info->IsSecondary)
 	info0 = RADEONPTR(pRADEONEnt->pPrimaryScrn);
 
-    pRADEONEnt->Controller[1]->IsUsed = TRUE;
-    pRADEONEnt->Controller[1]->IsActive = TRUE;
     pRADEONEnt->pCrtc[1]->curMode = *mode;
 
     switch (info->CurrentLayout.pixel_code) {
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index acdd7d38..b62bcf6d 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -118,8 +118,6 @@ typedef enum
 typedef struct _RADEONCrtcPrivateRec {
     int crtc_id;
     int binding;
-    Bool IsActive;
-    Bool IsUsed;
     /* Lookup table values to be set when the CRTC is enabled */
     CARD8 lut_r[256], lut_g[256], lut_b[256];
 } RADEONCrtcPrivateRec, *RADEONCrtcPrivatePtr;