Attachment 184971 Details for Bug 274831 – when OPMA server is detected, we validate modes according to local monitor DDC info by default.

[patch] when OPMA server is detected, we validate modes according to local monitor DDC info by default.

add-opma-server-support.patch (text/plain), 3.81 KB, created by LisaWu on 2007-09-03 03:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LisaWu

Created: 2007-09-03 03:30:00 UTC

Size: 3.81 KB

patch

obsolete

>--- src/radeon_driver.c	2007-09-04 03:25:03.000000000 +0800
>+++ src/radeon_driver.c-mod	2007-09-04 03:24:24.000000000 +0800
>@@ -2014,12 +2014,24 @@
>     }
> 
>     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 (pRADEONEnt->PortInfo[0].MonType == MT_UNKNOWN) {
>+           /*if OPMA server is detected, try to read local monitor DDC info from DDC_VGA line first*/
>+            if ((info->PciInfo->subsysVendor == 0x1002) &&
>+                (info->PciInfo->subsysCard  == 0x515e) && info->Chipset== PCI_CHIP_RN50_515E){
>+            if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_VGA, &pRADEONEnt->PortInfo[0])));
>+            else if((pRADEONEnt->PortInfo[0].MonType = RADEONDisplayDDCConnected(pScrn, DDC_DVI, &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])));
>+            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) {
>@@ -3409,6 +3421,7 @@
> 	    last = p;
> 	}
> 
>+ 
> 	/* Match up modes that are specified in the XF86Config file */
> 	if (ppModeName[0]) {
> 	    DisplayModePtr  next;
>@@ -3421,8 +3434,19 @@
> 	    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) {
>+            /* 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 OPMA server*/
>+                if ((info->PciInfo->subsysVendor == 0x1002) &&
>+                    (info->PciInfo->subsysCard  == 0x515e) && info->Chipset== PCI_CHIP_RN50_515E){ 
>+                if( width <= 1600 && height <= 1200 );
>+                else{
>+                    width = 1600;
>+                    height = 1200;
>+                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, " user define a large mode that OPMA may not support ,change maxVirtX to %d @_@ \n", maxVirtX);
>+                }
>+                }
> 		    for (p = ddcModes; p; p = next) {
> 			next = p->next;
> 
>@@ -3457,7 +3481,7 @@
> 		}
> 	    }
> 
>-	    /*
>+        /*
> 	     * Add remaining DDC modes if they're smaller than the user
> 	     * specified modes
> 	     */
>@@ -4017,7 +4041,11 @@
> 
>     info->ddc_mode =
> 	xf86ReturnOptValBool(info->Options, OPTION_DDC_MODE, FALSE);
>-
>+    /*if OPMA sever is detected,use DDC_MODE to validate mode*/
>+    if ((info->PciInfo->subsysVendor == 0x1002) &&
>+        (info->PciInfo->subsysCard  == 0x515e) && info->Chipset== PCI_CHIP_RN50_515E){
>+        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