Attachment 290372 Details for Bug 274831 – patch against xorg-x11-drv-ati-6.6.3-3.2.el5

[patch] patch against xorg-x11-drv-ati-6.6.3-3.2.el5

arima.diff (text/plain), 4.66 KB, created by LisaWu on 2007-12-25 04:28:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LisaWu

Created: 2007-12-25 04:28:44 UTC

Size: 4.66 KB

patch

obsolete

>--- xf86-video-ati-6.6.3/src/radeon_driver.c	2007-12-25 12:02:52.000000000 +0800
>+++ xf86-video-ati-6.6.3.bak/src/radeon_driver.c	2007-12-25 12:11:05.000000000 +0800
>@@ -2013,13 +2013,28 @@
> 
>     }
> 
>-    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(((!info->HasCRTC2) || info->IsDellServer)) {
>+	if (pRADEONEnt->PortInfo[0].MonType == MT_UNKNOWN){ 
>+		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*/
>+			struct detailed_monitor_section *m;
>+			int k;
>+			if(info->ChipFamily == CHIP_FAMILY_RV100 && !info->HasCRTC2){
>+				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"))) {
>+					if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_VGA, &pRADEONEnt->PortInfo[0])));      
>+					else pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_DVI, &pRADEONEnt->PortInfo[0]);
>+					break;
>+					}
>+				}
>+			}
>+		}
>+		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) {
>@@ -3362,7 +3377,8 @@
> 				  RADEONMonitorType DisplayType, int crtc2)
> {
>     RADEONInfoPtr   info       = RADEONPTR(pScrn1);
>-    DisplayModePtr  p;
>+    RADEONEntPtr pRADEONEnt    = RADEONEntPriv(pScrn1);
>+	DisplayModePtr  p;
>     DisplayModePtr  last       = NULL;
>     DisplayModePtr  first      = NULL;
>     DisplayModePtr  ddcModes   = NULL;
>@@ -3409,6 +3425,7 @@
> 	    last = p;
> 	}
> 
>+ 
> 	/* Match up modes that are specified in the XF86Config file */
> 	if (ppModeName[0]) {
> 	    DisplayModePtr  next;
>@@ -3421,9 +3438,29 @@
> 	    first = last = NULL;
> 
> 	    for (i = 0; ppModeName[i]; i++) {
>-		/* FIXME: Use HDisplay and VDisplay instead of mode string */
>-		if (sscanf(ppModeName[i], "%dx%d", &width, &height) == 2) {
>-		    for (p = ddcModes; p; p = next) {
>+            /* FIXME: Use HDisplay and VDisplay instead of mode string */
>+			if (sscanf(ppModeName[i], "%dx%d", &width, &height) == 2) {
>+				xf86DrvMsg(pScrn->scrnIndex, X_ERROR, " Match up modes that specified in xorg.conf \n");
>+			    {   /* don't set resolution higher than 1600x1200 for ARIMA server*/
>+				struct detailed_monitor_section *m;
>+				int k;
>+				if(info->ChipFamily == CHIP_FAMILY_RV100 && !info->HasCRTC2){
>+					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"))) {
>+						if( width <= 1600 && height <= 1200 );
>+						else{
>+							width = 1600;
>+							height = 1200;
>+
>+						}                       
>+						break;
>+					    }
>+					}
>+				}
>+			    }
>+			for (p = ddcModes; p; p = next) {
> 			next = p->next;
> 
> 			if (p->HDisplay == width && p->VDisplay == height) {
>@@ -3457,7 +3494,7 @@
> 		}
> 	    }
> 
>-	    /*
>+        /*
> 	     * Add remaining DDC modes if they're smaller than the user
> 	     * specified modes
> 	     */
>@@ -3979,7 +4016,8 @@
>     int            modesFound;
>     RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
>     char           *s;
>-
>+    struct detailed_monitor_section *m;
>+	int            k;
>     /* This option has two purposes:
>      *
>      * 1. For CRT, if this option is on, xf86ValidateModes (to
>@@ -4017,7 +4055,20 @@
> 
>     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)
>+	{
>+		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"))) {
>+				info->ddc_mode = TRUE;
>+				break;
>+			}
>+		}
>+	}
>     /* 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