rpms/xorg-x11-drv-ati/devel radeon-6.7.196-faster-ddc.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 xorg-x11-drv-ati.spec, 1.69, 1.70 radeon-6.7.195-faster-ddc.patch, 1.1, NONE radeon-git-upstream-fixes.patch, 1.1, NONE
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Wed Nov 14 20:32:57 UTC 2007
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3650/devel
Modified Files:
.cvsignore sources xorg-x11-drv-ati.spec
Added Files:
radeon-6.7.196-faster-ddc.patch
Removed Files:
radeon-6.7.195-faster-ddc.patch
radeon-git-upstream-fixes.patch
Log Message:
xf86-video-ati 6.7.196
radeon-6.7.196-faster-ddc.patch:
--- NEW FILE radeon-6.7.196-faster-ddc.patch ---
diff -up xf86-video-ati-6.7.196/src/radeon_output.c.jx xf86-video-ati-6.7.196/src/radeon_output.c
--- xf86-video-ati-6.7.196/src/radeon_output.c.jx 2007-11-14 15:21:22.000000000 -0500
+++ xf86-video-ati-6.7.196/src/radeon_output.c 2007-11-14 15:22:39.000000000 -0500
@@ -278,62 +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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 6 Oct 2007 18:20:36 -0000 1.20
+++ .cvsignore 14 Nov 2007 20:32:23 -0000 1.21
@@ -1 +1 @@
-xf86-video-ati-6.7.195.tar.bz2
+xf86-video-ati-6.7.196.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 6 Oct 2007 18:20:36 -0000 1.20
+++ sources 14 Nov 2007 20:32:23 -0000 1.21
@@ -1 +1 @@
-2f11b8e699fadd93e6932b07cc01bc64 xf86-video-ati-6.7.195.tar.bz2
+06db625391c75c8be86c4dd5a5d713e6 xf86-video-ati-6.7.196.tar.bz2
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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xorg-x11-drv-ati.spec 14 Nov 2007 00:44:05 -0000 1.69
+++ xorg-x11-drv-ati.spec 14 Nov 2007 20:32:23 -0000 1.70
@@ -4,8 +4,8 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
-Version: 6.7.195
-Release: 5%{?dist}
+Version: 6.7.196
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -18,8 +18,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
+Patch4: radeon-6.7.196-faster-ddc.patch
# Rage 128 patches (100-199)
@@ -43,7 +42,6 @@
%setup -q -n %{tarball}-%{version}
%patch2 -p1 -b .renderaccel
-%patch3 -p1 -b .fixes
%patch4 -p1 -b .ddc
%build
@@ -78,14 +76,17 @@
%{_datadir}/hwdata/videoaliases/ati.xinf
%{_datadir}/hwdata/videoaliases/r128.xinf
%{_datadir}/hwdata/videoaliases/radeon.xinf
-#{moduledir}/multimedia/theatre200_drv.so
-#{moduledir}/multimedia/theatre_detect_drv.so
-#{moduledir}/multimedia/theatre_drv.so
+%{moduledir}/multimedia/theatre200_drv.so
+%{moduledir}/multimedia/theatre_detect_drv.so
+%{moduledir}/multimedia/theatre_drv.so
%{_mandir}/man4/ati.4*
%{_mandir}/man4/r128.4*
%{_mandir}/man4/radeon.4*
%changelog
+* Wed Nov 14 2007 Adam Jackson <ajax at redhat.com> 6.7.196-1
+- xf86-video-ati 6.7.196
+
* Tue Nov 13 2007 Adam Jackson <ajax at redhat.com> 6.7.195-5
- Require xserver 1.4.99.1
--- radeon-6.7.195-faster-ddc.patch DELETED ---
--- radeon-git-upstream-fixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list