Attachment 291574 Details for Bug 274831 – proposed fix - just cleaned up the ATI patch.

[patch] proposed fix - just cleaned up the ATI patch.

radeon-6.6.3-arima-rn50.patch (text/plain), 3.53 KB, created by Dave Airlie on 2008-01-14 08:28:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2008-01-14 08:28:09 UTC

Size: 3.53 KB

patch

obsolete

>--- xf86-video-ati-6.6.3/src/radeon_driver.c.arima	2008-01-14 18:22:44.000000000 +1000
>+++ xf86-video-ati-6.6.3/src/radeon_driver.c	2008-01-14 18:24:58.000000000 +1000
>@@ -950,6 +950,25 @@
>     return (n + (d / 2)) / d;
> }
> 
>+static Bool RADEONIsARIMAServer(ScrnInfoPtr pScrn)
>+{
>+    RADEONInfoPtr info = RADEONPTR(pScrn);
>+    RADEONEntPtr pRADEONEnt   = RADEONEntPriv(pScrn);
>+    struct detailed_monitor_section *m;
>+    int k;
>+
>+    if (!pRADEONEnt->PortInfo[0].MonInfo)
>+	return FALSE;
>+
>+    m = pRADEONEnt->PortInfo[0].MonInfo->det_mon;
>+    for (k=0; k<4; k++) {
>+	if(m[k].type == DS_NAME
>+	   && (!strcmp(m[k].section.name, "AQUARIUS")|| !strcmp(m[k].section.name,"KIRA")))
>+	    return TRUE;
>+    }
>+    return FALSE;
>+}
>+
> static RADEONMonitorType RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, RADEONDDCType DDCType, RADEONConnector* port)
> {
>     RADEONInfoPtr info = RADEONPTR(pScrn);
>@@ -2019,11 +2038,17 @@
>             /*set monitor type to DFP and use hard-coded EDID in VBIOS to set mode*/
>             pRADEONEnt->PortInfo[0].MonType = MT_DFP;
>         } 
>-        else 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;
>+        else if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_DVI, &pRADEONEnt->PortInfo[0]))) {
>+	    /*if ARIMA server is detected, try to read local monitor DDC info from DDC_VGA line first*/
>+	    if (RADEONIsARIMAServer(pScrn)) {
>+		if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_VGA, &pRADEONEnt->PortInfo[0])));      
>+		else 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) {
>@@ -3418,7 +3443,7 @@
> 	    last = p;
> 	}
> 
>-	/* Match up modes that are specified in the XF86Config file */
>+ 	/* Match up modes that are specified in the XF86Config file */
> 	if (ppModeName[0]) {
> 	    DisplayModePtr  next;
> 
>@@ -3432,6 +3457,18 @@
> 	    for (i = 0; ppModeName[i]; i++) {
> 		/* FIXME: Use HDisplay and VDisplay instead of mode string */
> 		if (sscanf(ppModeName[i], "%dx%d", &width, &height) == 2) {
>+		    {   /* don't set resolution higher than 1600x1200 for ARIMA server*/
>+			if(info->ChipFamily == CHIP_FAMILY_RV100 && !info->HasCRTC2){
>+			    if (RADEONIsARIMAServer(pScrn)) {
>+				if( width <= 1600 && height <= 1200 );
>+				else{
>+				    width = 1600;
>+				    height = 1200;
>+				}                       
>+			    }
>+			}
>+		    }
>+
> 		    for (p = ddcModes; p; p = next) {
> 			next = p->next;
> 
>@@ -4034,7 +4071,13 @@
> 
>     info->ddc_mode =
> 	xf86ReturnOptValBool(info->Options, OPTION_DDC_MODE, FALSE);
>-
>+    
>+    /*we add extra code to detect a ARIMA server
>+      DDCMODE will be enabled for the machine*/
>+    if(info->ChipFamily == CHIP_FAMILY_RV100 && !info->HasCRTC2) {
>+	if (RADEONIsARIMAServer(pScrn))
>+	    info->ddc_mode = TRUE;
>+    }
>     /* don't use RMX if we have a dual-tmds panels */
>    if (pRADEONEnt->MonType2 == MT_DFP)
> 	info->ddc_mode = TRUE;

Actions: View | Diff

Attachments on bug 274831: 184971 | 290371 | 290372 | 291574