Attachment 1133 Details for Bug 1559 – [FIXED_X11R68x] Another improved patch

[patch] [FIXED_X11R68x] Another improved patch

xorg_radeon_monitor_fixes.diff (text/plain), 7.91 KB, created by HUI YU on 2004-10-19 17:09:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: HUI YU

Created: 2004-10-19 17:09:40 UTC

Size: 7.91 KB

patch

obsolete

>Index: radeon_bios.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_bios.c,v
>retrieving revision 1.1
>diff -u -r1.1 radeon_bios.c
>--- radeon_bios.c	30 Jul 2004 22:20:21 -0000	1.1
>+++ radeon_bios.c	19 Oct 2004 23:49:15 -0000
>@@ -198,13 +198,28 @@
> 	    return FALSE;
> 	}
>     } else {
>+	/* Some laptops only have one connector (VGA) listed in the connector table, 
>+	 * we need to add LVDS in as a non-DDC display. 
>+	 * Note, we can't assume the listed VGA will be filled in PortInfo[0],
>+	 * when walking through connector table. connector_found has following meaning: 
>+	 * 0 -- nothing found, 
>+	 * 1 -- only PortInfo[0] filled, 
>+	 * 2 -- only PortInfo[1] filled,
>+	 * 3 -- both are filled.
>+	 */
>+	int connector_found = 0;
>+
> 	if ((tmp = RADEON_BIOS16(info->ROMHeaderStart + 0x50))) {
> 	    for (i = 1; i < 4; i++) {
> 
> 		if (!RADEON_BIOS8(tmp + i*2) && i > 1) break; /* end of table */
> 		
> 		tmp0 = RADEON_BIOS16(tmp + i*2);
>-		if (((tmp0 >> 12) & 0x1f) == 0) continue; /* no connector */
>+		if (((tmp0 >> 12) & 0x0f) == 0) continue;     /* no connector */
>+		if (connector_found > 0) {
>+		    if (pRADEONEnt->PortInfo[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 */
>@@ -222,9 +237,7 @@
> 		    pRADEONEnt->PortInfo[tmp1].TMDSType == TMDS_INT)
> 		    pRADEONEnt->PortInfo[tmp1].TMDSType = TMDS_UNKNOWN;
> 		
>-		xf86DrvMsg(0, X_INFO, "Connector%d: DDCType-%d, DACType-%d, TMDSType-%d, ConnectorType-%d\n",
>-			   tmp1, pRADEONEnt->PortInfo[tmp1].DDCType, pRADEONEnt->PortInfo[tmp1].DACType,
>-			   pRADEONEnt->PortInfo[tmp1].TMDSType, pRADEONEnt->PortInfo[tmp1].ConnectorType);
>+		connector_found += (tmp1 + 1);
> 	    }
> 	} else {
> 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No Connector Info Table found!\n");
>@@ -232,14 +245,54 @@
> 	}
> 
> 	if (info->IsMobility) {
>-	  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;      
>-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "LCD DDC Info Table found!\n");
>-	      }
>+	    /* 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 == 1) {
>+		    memcpy (&pRADEONEnt->PortInfo[1], &pRADEONEnt->PortInfo[0], 
>+			    sizeof (pRADEONEnt->PortInfo[0]));
>+		}
>+		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;
>+
>+		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "LVDS port is not in connector table, added in.\n");
>+		if (connector_found == 0) connector_found = 1;
>+		else connector_found = 3;
> 	    }
>-	  } 
>+
>+	    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;      
>+			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;
>+	    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);
>+	}
>+	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);
> 	}
> 
> #if 0
>Index: radeon_driver.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v
>retrieving revision 1.23
>diff -u -r1.23 radeon_driver.c
>--- radeon_driver.c	11 Oct 2004 23:20:26 -0000	1.23
>+++ radeon_driver.c	19 Oct 2004 23:49:16 -0000
>@@ -1726,6 +1726,13 @@
> 		break;
> 	    }
> 	}
>+	for (i = 0; i < max_mt; i++) {
>+	    if (strcmp(s2, MonTypeName[i]) == 0) {
>+		pRADEONEnt->PortInfo[1].MonType = MonTypeID[i];
>+		break;
>+	    }
>+	}
>+
> 	if (i ==  max_mt)
> 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> 		       "Invalid Monitor type specified for 2nd port \n");
>@@ -1758,32 +1765,45 @@
> 
>     }
> 
>-    if (pRADEONEnt->PortInfo[0].MonType == MT_UNKNOWN || pRADEONEnt->PortInfo[1].MonType == MT_UNKNOWN) {
>-
>-	if(((!info->HasCRTC2) || info->IsDellServer) && 
>-	   (pRADEONEnt->PortInfo[0].MonType == MT_UNKNOWN)) {
>+    if(((!info->HasCRTC2) || info->IsDellServer)) {
>+	if (pRADEONEnt->PortInfo[0].MonType == MT_UNKNOWN) {
> 	    if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_DVI, &pRADEONEnt->PortInfo[0])));
> 	    else if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_VGA, &pRADEONEnt->PortInfo[0])));
> 	    else if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_CRT2, &pRADEONEnt->PortInfo[0])));
> 	    else
> 		pRADEONEnt->PortInfo[0].MonType = MT_CRT;
>+	}
> 
>-	    if (!ignore_edid) {
>-		if (pRADEONEnt->PortInfo[0].MonInfo) {
>-		    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Monitor1 EDID data ---------------------------\n");
>-		    xf86PrintEDID(pRADEONEnt->PortInfo[0].MonInfo );
>-		    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "End of Monitor1 EDID data --------------------\n");
>-		}
>+	if (!ignore_edid) {
>+	    if (pRADEONEnt->PortInfo[0].MonInfo) {
>+		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Monitor1 EDID data ---------------------------\n");
>+		xf86PrintEDID(pRADEONEnt->PortInfo[0].MonInfo );
>+		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "End of Monitor1 EDID data --------------------\n");
> 	    }
>-
>-	    pRADEONEnt->MonType1 = pRADEONEnt->PortInfo[0].MonType;
>-	    pRADEONEnt->MonInfo1 = pRADEONEnt->PortInfo[0].MonInfo;
>-	    pRADEONEnt->MonType2 = MT_NONE;
>-	    pRADEONEnt->MonInfo2 = NULL;
>-	    info->MergeType = MT_NONE;
>-	    return TRUE;
> 	}
> 
>+	pRADEONEnt->MonType1 = pRADEONEnt->PortInfo[0].MonType;
>+	pRADEONEnt->MonInfo1 = pRADEONEnt->PortInfo[0].MonInfo;
>+	pRADEONEnt->MonType2 = MT_NONE;
>+	pRADEONEnt->MonInfo2 = NULL;
>+	info->MergeType = MT_NONE;
>+	info->DisplayType = pRADEONEnt->MonType1;
>+
>+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
>+		   "Primary:\n Monitor   -- %s\n Connector -- %s\n DAC Type  -- %s\n TMDS Type -- %s\n DDC Type  -- %s\n",
>+		   MonTypeName[pRADEONEnt->PortInfo[0].MonType+1],
>+		   info->IsAtomBios ?
>+		   ConnectorTypeNameATOM[pRADEONEnt->PortInfo[0].ConnectorType]:
>+		   ConnectorTypeName[pRADEONEnt->PortInfo[0].ConnectorType],
>+		   DACTypeName[pRADEONEnt->PortInfo[0].DACType+1],
>+		   TMDSTypeName[pRADEONEnt->PortInfo[0].TMDSType+1],
>+		   DDCTypeName[pRADEONEnt->PortInfo[0].DDCType]);
>+
>+	return TRUE;
>+    }
>+
>+    if (pRADEONEnt->PortInfo[0].MonType == MT_UNKNOWN || pRADEONEnt->PortInfo[1].MonType == MT_UNKNOWN) {
>+
> 	/* Primary Head (DVI or Laptop Int. panel)*/
> 	/* A ddc capable display connected on DVI port */
> 	if (pRADEONEnt->PortInfo[0].MonType == MT_UNKNOWN) {

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1559: 1033 | 1034 | 1035 | 1121 | 1128 | 1129 | 1130 | 1133 | 1539 | 1545 | 1611 | 1612 | 1683 | 1684 | 1720 | 1721 | 1722 | 1723

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.