RADEON: remove hardcoded output limit and PortInfo stuff

1 files changed, 65 insertions, 62 deletions

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 4b3ec56f..6e08f241 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -148,49 +148,49 @@ Bool RADEONGetConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 			    /* sharing same port with id[0] */
 			    if (((portinfo>>8) & 0xf) == id[0]) {
 				if (i == 3) 
-				    pRADEONEnt->PortInfo[0]->TMDSType = TMDS_INT;
+				    info->BiosConnector[0].TMDSType = TMDS_INT;
 				else if (i == 7)
-				    pRADEONEnt->PortInfo[0]->TMDSType = TMDS_EXT;
+				    info->BiosConnector[0].TMDSType = TMDS_EXT;
 
-				if (pRADEONEnt->PortInfo[0]->DACType == DAC_UNKNOWN)
-				    pRADEONEnt->PortInfo[0]->DACType = (portinfo & 0xf) - 1;
+				if (info->BiosConnector[0].DACType == DAC_UNKNOWN)
+				    info->BiosConnector[0].DACType = (portinfo & 0xf) - 1;
 				continue;
 			    }
 			}
 
 			id[crtc] = (portinfo>>8) & 0xf; 
-			pRADEONEnt->PortInfo[crtc]->DACType = (portinfo & 0xf) - 1;
-			pRADEONEnt->PortInfo[crtc]->ConnectorType = (portinfo>>4) & 0xf;
+			info->BiosConnector[crtc].DACType = (portinfo & 0xf) - 1;
+			info->BiosConnector[crtc].ConnectorType = (portinfo>>4) & 0xf;
 			if (i == 3) 
-			    pRADEONEnt->PortInfo[crtc]->TMDSType = TMDS_INT;
+			    info->BiosConnector[crtc].TMDSType = TMDS_INT;
 			else if (i == 7)
-			    pRADEONEnt->PortInfo[crtc]->TMDSType = TMDS_EXT;
+			    info->BiosConnector[crtc].TMDSType = TMDS_EXT;
 			
 			if((tmp0 = RADEON_BIOS16 (info->MasterDataStart + 24)) && id[crtc]) {
 			    switch (RADEON_BIOS16 (tmp0 + 4 + 27 * id[crtc]) * 4) 
 			    {
 			    case RADEON_GPIO_MONID:
-				pRADEONEnt->PortInfo[crtc]->DDCType = DDC_MONID;
+				info->BiosConnector[crtc].DDCType = DDC_MONID;
 				break;
 			    case RADEON_GPIO_DVI_DDC:
-				pRADEONEnt->PortInfo[crtc]->DDCType = DDC_DVI;
+				info->BiosConnector[crtc].DDCType = DDC_DVI;
 				break;
 			    case RADEON_GPIO_VGA_DDC:
-				pRADEONEnt->PortInfo[crtc]->DDCType = DDC_VGA;
+				info->BiosConnector[crtc].DDCType = DDC_VGA;
 				break;
 			    case RADEON_GPIO_CRT2_DDC:
-				pRADEONEnt->PortInfo[crtc]->DDCType = DDC_CRT2;
+				info->BiosConnector[crtc].DDCType = DDC_CRT2;
 				break;
 			    case RADEON_LCD_GPIO_MASK:
-				pRADEONEnt->PortInfo[crtc]->DDCType = DDC_LCD;
+				info->BiosConnector[crtc].DDCType = DDC_LCD;
 				break;
 			    default:
-				pRADEONEnt->PortInfo[crtc]->DDCType = DDC_NONE_DETECTED;
+				info->BiosConnector[crtc].DDCType = DDC_NONE_DETECTED;
 				break;
 			    }
 
 			} else {
-			    pRADEONEnt->PortInfo[crtc]->DDCType = DDC_NONE_DETECTED;
+			    info->BiosConnector[crtc].DDCType = DDC_NONE_DETECTED;
 			}
 			crtc++;
 		    } else {
@@ -200,22 +200,22 @@ Bool RADEONGetConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 			for (j=0; j<2; j++) {
 			    if (((portinfo>>8) & 0xf) == id[j]) {
 				if (i == 3) 
-				    pRADEONEnt->PortInfo[j]->TMDSType = TMDS_INT;
+				    info->BiosConnector[j].TMDSType = TMDS_INT;
 				else if (i == 7)
-				    pRADEONEnt->PortInfo[j]->TMDSType = TMDS_EXT;
+				    info->BiosConnector[j].TMDSType = TMDS_EXT;
 
-				if (pRADEONEnt->PortInfo[j]->DACType == DAC_UNKNOWN)
-				    pRADEONEnt->PortInfo[j]->DACType = (portinfo & 0xf) - 1;
+				if (info->BiosConnector[j].DACType == DAC_UNKNOWN)
+				    info->BiosConnector[j].DACType = (portinfo & 0xf) - 1;
 			    }
 			}
 		    }
 		}
 	    }
-
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Bios Connector table: \n");
 	    for (i=0; i<2; i++) {
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Port%d: DDCType-%d, DACType-%d, TMDSType-%d, ConnectorType-%d\n",
-			   i, pRADEONEnt->PortInfo[i]->DDCType, pRADEONEnt->PortInfo[i]->DACType,
-			   pRADEONEnt->PortInfo[i]->TMDSType, pRADEONEnt->PortInfo[i]->ConnectorType);
+			   i, info->BiosConnector[i].DDCType, info->BiosConnector[i].DACType,
+			   info->BiosConnector[i].TMDSType, info->BiosConnector[i].ConnectorType);
 	    }	    
 	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No Device Info Table found!\n");
@@ -242,25 +242,27 @@ Bool RADEONGetConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 		tmp0 = RADEON_BIOS16(tmp + i*2);
 		if (((tmp0 >> 12) & 0x0f) == 0) continue;     /* no connector */
 		if (connector_found > 0) {
-		    if (pRADEONEnt->PortInfo[tmp1]->DDCType == ((tmp0 >> 8) & 0x0f))
+		    if (info->BiosConnector[tmp1].DDCType == ((tmp0 >> 8) & 0x0f))
 			continue;                             /* same connector */
 		}
 
 		/* internal DDC_DVI port will get assigned to PortInfo[0], or if there is no DDC_DVI (like in some IGPs). */
 		tmp1 = ((((tmp0 >> 8) & 0xf) == DDC_DVI) || (tmp1 == 1)) ? 0 : 1; /* determine port info index */
 		
-		pRADEONEnt->PortInfo[tmp1]->DDCType        = (tmp0 >> 8) & 0x0f;
-		if (pRADEONEnt->PortInfo[tmp1]->DDCType > DDC_CRT2) pRADEONEnt->PortInfo[tmp1]->DDCType = DDC_NONE_DETECTED;
-		pRADEONEnt->PortInfo[tmp1]->DACType        = (tmp0 & 0x01) ? DAC_TVDAC : DAC_PRIMARY;
-		pRADEONEnt->PortInfo[tmp1]->ConnectorType  = (tmp0 >> 12) & 0x0f;
-		if (pRADEONEnt->PortInfo[tmp1]->ConnectorType > CONNECTOR_UNSUPPORTED) pRADEONEnt->PortInfo[tmp1]->ConnectorType = CONNECTOR_UNSUPPORTED;
-		pRADEONEnt->PortInfo[tmp1]->TMDSType       = ((tmp0 >> 4) & 0x01) ? TMDS_EXT : TMDS_INT;
+		info->BiosConnector[tmp1].DDCType        = (tmp0 >> 8) & 0x0f;
+		if (info->BiosConnector[tmp1].DDCType > DDC_CRT2)
+		    info->BiosConnector[tmp1].DDCType = DDC_NONE_DETECTED;
+		info->BiosConnector[tmp1].DACType        = (tmp0 & 0x01) ? DAC_TVDAC : DAC_PRIMARY;
+		info->BiosConnector[tmp1].ConnectorType  = (tmp0 >> 12) & 0x0f;
+		if (info->BiosConnector[tmp1].ConnectorType > CONNECTOR_UNSUPPORTED)
+		    info->BiosConnector[tmp1].ConnectorType = CONNECTOR_UNSUPPORTED;
+		info->BiosConnector[tmp1].TMDSType       = ((tmp0 >> 4) & 0x01) ? TMDS_EXT : TMDS_INT;
 
 		/* some sanity checks */
-		if (((pRADEONEnt->PortInfo[tmp1]->ConnectorType != CONNECTOR_DVI_D) &&
-		     (pRADEONEnt->PortInfo[tmp1]->ConnectorType != CONNECTOR_DVI_I)) &&
-		    pRADEONEnt->PortInfo[tmp1]->TMDSType == TMDS_INT)
-		    pRADEONEnt->PortInfo[tmp1]->TMDSType = TMDS_UNKNOWN;
+		if (((info->BiosConnector[tmp1].ConnectorType != CONNECTOR_DVI_D) &&
+		     (info->BiosConnector[tmp1].ConnectorType != CONNECTOR_DVI_I)) &&
+		    info->BiosConnector[tmp1].TMDSType == TMDS_INT)
+		    info->BiosConnector[tmp1].TMDSType = TMDS_UNKNOWN;
 		
 		connector_found += (tmp1 + 1);
 	    }
@@ -270,19 +272,20 @@ Bool RADEONGetConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 	}
 
 	if (info->IsMobility) {
+#if 0
 	    /* For the cases where only one VGA connector is found, 
 	       we assume LVDS is not listed in the connector table, 
 	       add it in here as the first port.
 	    */
-	    if ((connector_found < 3) && (pRADEONEnt->PortInfo[tmp1]->ConnectorType == CONNECTOR_CRT)) {
+	    if ((connector_found < 3) && (info->BiosConnector[tmp1]->ConnectorType == CONNECTOR_CRT)) {
 		if (connector_found == 1) {
-		    memcpy (&pRADEONEnt->PortInfo[1], &pRADEONEnt->PortInfo[0], 
-			    sizeof (pRADEONEnt->PortInfo[0]));
+		    memcpy (&info->BiosConnector[1], &info->BiosConnector[0], 
+			    sizeof (info->BiosConnector));
 		}
-		pRADEONEnt->PortInfo[0]->DACType = DAC_TVDAC;
-		pRADEONEnt->PortInfo[0]->TMDSType = TMDS_UNKNOWN;
-		pRADEONEnt->PortInfo[0]->DDCType = DDC_NONE_DETECTED;
-		pRADEONEnt->PortInfo[0]->ConnectorType = CONNECTOR_PROPRIETARY;
+		info->BiosConnector[0].DACType = DAC_TVDAC;
+		info->BiosConnector[0].TMDSType = TMDS_UNKNOWN;
+		info->BiosConnector[0].DDCType = DDC_NONE_DETECTED;
+		info->BiosConnector[0].ConnectorType = CONNECTOR_PROPRIETARY;
 
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "LVDS port is not in connector table, added in.\n");
 		if (connector_found == 0) connector_found = 1;
@@ -290,54 +293,54 @@ Bool RADEONGetConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 	    }
 
 	    /* some bioses seem to list the LVDS port as DVI hack around that here */
-	    if (pRADEONEnt->PortInfo[0]->ConnectorType == CONNECTOR_DVI_D) {
-		pRADEONEnt->PortInfo[0]->ConnectorType = CONNECTOR_PROPRIETARY;
+	    if (info->BiosConnector[0].ConnectorType == CONNECTOR_DVI_D) {
+		info->BiosConnector[0].ConnectorType = CONNECTOR_PROPRIETARY;
 	    }
-
+#endif
 	    if ((tmp = RADEON_BIOS16(info->ROMHeaderStart + 0x42))) {
 	        if ((tmp0 = RADEON_BIOS16(tmp + 0x15))) {
 		    if ((tmp1 = RADEON_BIOS8(tmp0+2) & 0x07)) {	    
-			pRADEONEnt->PortInfo[0]->DDCType	= tmp1;      
-			if (pRADEONEnt->PortInfo[0]->DDCType > DDC_LCD) {
+			info->BiosConnector[0].DDCType	= tmp1;      
+			if (info->BiosConnector[0].DDCType > DDC_LCD) {
 			    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 				       "Unknown DDCType %d found\n",
-				       pRADEONEnt->PortInfo[0]->DDCType);
-			    pRADEONEnt->PortInfo[0]->DDCType = DDC_NONE_DETECTED;
+				       info->BiosConnector[0].DDCType);
+			    info->BiosConnector[0].DDCType = DDC_NONE_DETECTED;
 			}
 			xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "LCD DDC Info Table found!\n");
 		    }
 		}
 	    } 
 	} else if (connector_found == 2) {
-	    memcpy (&pRADEONEnt->PortInfo[0], &pRADEONEnt->PortInfo[1], 
-		    sizeof (pRADEONEnt->PortInfo[0]));	
-	    pRADEONEnt->PortInfo[1]->DACType = DAC_UNKNOWN;
-	    pRADEONEnt->PortInfo[1]->TMDSType = TMDS_UNKNOWN;
-	    pRADEONEnt->PortInfo[1]->DDCType = DDC_NONE_DETECTED;
-	    pRADEONEnt->PortInfo[1]->ConnectorType = CONNECTOR_NONE;
+	    memcpy (&info->BiosConnector[0], &info->BiosConnector[1], 
+		    sizeof (info->BiosConnector[0]));	
+	    info->BiosConnector[1].DACType = DAC_UNKNOWN;
+	    info->BiosConnector[1].TMDSType = TMDS_UNKNOWN;
+	    info->BiosConnector[1].DDCType = DDC_NONE_DETECTED;
+	    info->BiosConnector[1].ConnectorType = CONNECTOR_NONE;
 	    connector_found = 1;
 	}
 
 	if (connector_found == 0) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No connector found in Connector Info Table.\n");
 	} else {
-	    xf86DrvMsg(0, X_INFO, "Connector0: DDCType-%d, DACType-%d, TMDSType-%d, ConnectorType-%d\n",
-		       pRADEONEnt->PortInfo[0]->DDCType, pRADEONEnt->PortInfo[0]->DACType,
-		       pRADEONEnt->PortInfo[0]->TMDSType, pRADEONEnt->PortInfo[0]->ConnectorType);
+	    xf86DrvMsg(0, X_INFO, "Bios Connector0: DDCType-%d, DACType-%d, TMDSType-%d, ConnectorType-%d\n",
+		       info->BiosConnector[0].DDCType, info->BiosConnector[0].DACType,
+		       info->BiosConnector[0].TMDSType, info->BiosConnector[0].ConnectorType);
 	}
 	if (connector_found == 3) {
-	    xf86DrvMsg(0, X_INFO, "Connector1: DDCType-%d, DACType-%d, TMDSType-%d, ConnectorType-%d\n",
-		       pRADEONEnt->PortInfo[1]->DDCType, pRADEONEnt->PortInfo[1]->DACType,
-		       pRADEONEnt->PortInfo[1]->TMDSType, pRADEONEnt->PortInfo[1]->ConnectorType);
+	    xf86DrvMsg(0, X_INFO, "Bios Connector1: DDCType-%d, DACType-%d, TMDSType-%d, ConnectorType-%d\n",
+		       info->BiosConnector[1].DDCType, info->BiosConnector[1].DACType,
+		       info->BiosConnector[1].TMDSType, info->BiosConnector[1].ConnectorType);
 	}
 
 #if 0
 /* External TMDS Table, not used now */
         if ((tmp0 = RADEON_BIOS16(info->ROMHeaderStart + 0x58))) {
 
-            //pRADEONEnt->PortInfo[1]->DDCType = (RADEON_BIOS8(tmp0 + 7) & 0x07);
-            //pRADEONEnt->PortInfo[1]->ConnectorType  = CONNECTOR_DVI_I;
-            //pRADEONEnt->PortInfo[1]->TMDSType = TMDS_EXT;
+            //info->BiosConnector[1].DDCType = (RADEON_BIOS8(tmp0 + 7) & 0x07);
+            //info->BiosConnector[1].ConnectorType  = CONNECTOR_DVI_I;
+            //info->BiosConnector[1].TMDSType = TMDS_EXT;
             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "External TMDS found.\n");
 
         } else {