rpms/xorg-x11-drv-ati/devel radeon-6.6.1-dotclock-filter.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27508

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.1-dotclock-filter.patch 
Log Message:
- Filter the EDID mode list by the monitor's reported pixel clock.  Bump
  the BuildReq to a server that provides the necessary ABI field.


radeon-6.6.1-dotclock-filter.patch:
 radeon_driver.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE radeon-6.6.1-dotclock-filter.patch ---
--- xf86-video-ati-6.6.1/src/radeon_driver.c.dotclock-filter	2006-06-26 18:40:29.000000000 -0400
+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-06-26 18:41:55.000000000 -0400
@@ -3739,7 +3739,7 @@
 {
     MonPtr      mon = pScrn->monitor;
     xf86MonPtr  ddc = mon->DDC;
-    int         i;
+    int         i, clock;
 
     if (flag) { /* HSync */
 	for (i = 0; i < 4; i++) {
@@ -3747,6 +3747,9 @@
 		mon->nHsync = 1;
 		mon->hsync[0].lo = ddc->det_mon[i].section.ranges.min_h;
 		mon->hsync[0].hi = ddc->det_mon[i].section.ranges.max_h;
+		clock = ddc->det_mon[i].section.ranges.max_clock * 1000;
+		if (clock > mon->maxPixClock)
+		    mon->maxPixClock = clock;
 		return;
 	    }
 	}
@@ -3793,6 +3796,9 @@
 		mon->nVrefresh = 1;
 		mon->vrefresh[0].lo = ddc->det_mon[i].section.ranges.min_v;
 		mon->vrefresh[0].hi = ddc->det_mon[i].section.ranges.max_v;
+		clock = ddc->det_mon[i].section.ranges.max_clock * 1000;
+		if (clock > mon->maxPixClock)
+		    mon->maxPixClock = clock;
 		return;
 	    }
 	}


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-ati.spec	17 Jun 2006 07:02:56 -0000	1.24
+++ xorg-x11-drv-ati.spec	26 Jun 2006 22:57:49 -0000	1.25
@@ -24,6 +24,8 @@
 Source2:   r128.xinf
 Source3:   radeon.xinf
 
+Patch0:    radeon-6.6.1-dotclock-filter.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
@@ -33,7 +35,7 @@
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+Requires:  xorg-x11-server-Xorg >= 1.1.0-12
 
 %description 
 X.Org X11 ati video driver.
@@ -41,6 +43,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .dotclock-filter
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -83,6 +87,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-2
+- Filter the EDID mode list by the monitor's reported pixel clock.  Bump
+  the BuildReq to a server that provides the necessary ABI field.
+
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 6.6.1-1
 - Updated xorg-x11-drv-ati to version 6.6.1 update release for X11R7.1
 - Drop db-root-visual.patch, as it is included in 6.6.1