rpms/xorg-x11-drv-ati/devel radeon-6.7.195-faster-ddc.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.66, 1.67

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30171

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.7.195-faster-ddc.patch 
Log Message:
* Thu Nov 08 2007 Adam Jackson <ajax at redhat.com> 6.7.195-4
- radeon-6.7.195-faster-ddc.patch: Speed up X startup by assuming the
  monitor doesn't need a dead chicken waved over it to get DDC.


radeon-6.7.195-faster-ddc.patch:

--- NEW FILE radeon-6.7.195-faster-ddc.patch ---
diff -up xf86-video-ati-6.7.195/src/radeon_output.c.jx xf86-video-ati-6.7.195/src/radeon_output.c
--- xf86-video-ati-6.7.195/src/radeon_output.c.jx	2007-11-07 19:06:52.000000000 -0500
+++ xf86-video-ati-6.7.195/src/radeon_output.c	2007-11-08 16:23:39.000000000 -0500
@@ -278,61 +278,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pS
     DDCReg = radeon_output->DDCReg;
 
     /* Read and output monitor info using DDC2 over I2C bus */
-    if (radeon_output->pI2CBus && info->ddc2 && (DDCReg != RADEON_LCD_GPIO_MASK) && (DDCReg != RADEON_MDGPIO_EN_REG)) {
-	OUTREG(DDCReg, INREG(DDCReg) &
-	       (CARD32)~(RADEON_GPIO_A_0 | RADEON_GPIO_A_1));
-
-	/* For some old monitors (like Compaq Presario FP500), we need
-	 * following process to initialize/stop DDC
-	 */
-	OUTREG(DDCReg, INREG(DDCReg) & ~(RADEON_GPIO_EN_1));
-	for (j = 0; j < 3; j++) {
-	    OUTREG(DDCReg,
-		   INREG(DDCReg) & ~(RADEON_GPIO_EN_0));
-	    usleep(13000);
-
-	    OUTREG(DDCReg,
-		   INREG(DDCReg) & ~(RADEON_GPIO_EN_1));
-	    for (i = 0; i < 10; i++) {
-		usleep(15000);
-		if (INREG(DDCReg) & RADEON_GPIO_Y_1)
-		    break;
-	    }
-	    if (i == 10) continue;
-
-	    usleep(15000);
-
-	    OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_0);
-	    usleep(15000);
-
-	    OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_1);
-	    usleep(15000);
-	    OUTREG(DDCReg,
-		   INREG(DDCReg) & ~(RADEON_GPIO_EN_0));
-	    usleep(15000);
-	    *MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, radeon_output->pI2CBus);
-
-	    OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_1);
-	    OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_0);
-	    usleep(15000);
-	    OUTREG(DDCReg,
-		   INREG(DDCReg) & ~(RADEON_GPIO_EN_1));
-	    for (i = 0; i < 5; i++) {
-		usleep(15000);
-		if (INREG(DDCReg) & RADEON_GPIO_Y_1)
-		    break;
-	    }
-	    usleep(15000);
-	    OUTREG(DDCReg,
-		   INREG(DDCReg) & ~(RADEON_GPIO_EN_0));
-	    usleep(15000);
-
-	    OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_1);
-	    OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_0);
-	    usleep(15000);
-	    if(*MonInfo)  break;
-	}
-    } else if (radeon_output->pI2CBus && info->ddc2 && ((DDCReg == RADEON_LCD_GPIO_MASK) || (DDCReg == RADEON_MDGPIO_EN_REG))) {
+    if (radeon_output->pI2CBus && info->ddc2) {
          *MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, radeon_output->pI2CBus);
     } else {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DDC2/I2C is not properly initialized\n");


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- xorg-x11-drv-ati.spec	16 Oct 2007 02:28:19 -0000	1.66
+++ xorg-x11-drv-ati.spec	8 Nov 2007 21:58:26 -0000	1.67
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.7.195
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 # Radeon patches (0-99)
 Patch2:     radeon-6.6.3-renderaccel-buglet.patch
 Patch3:     radeon-git-upstream-fixes.patch
+Patch4:     radeon-6.7.195-faster-ddc.patch
 
 # Rage 128 patches (100-199)
 
@@ -43,6 +44,7 @@
 
 %patch2 -p1 -b .renderaccel
 %patch3 -p1 -b .fixes
+%patch4 -p1 -b .ddc
 
 %build
 %configure --disable-static
@@ -83,6 +85,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Nov 08 2007 Adam Jackson <ajax at redhat.com> 6.7.195-4
+- radeon-6.7.195-faster-ddc.patch: Speed up X startup by assuming the
+  monitor doesn't need a dead chicken waved over it to get DDC.
+
 * Tue Oct 16 2007 Dave Airlie <airlied at redhat.com> 6.7.195-3
 - upstream fixes including previous patches + attempted mac detection