rpms/xorg-x11-drv-ati/devel radeon-6.6.192-dotclock-filter.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 xorg-x11-drv-ati.spec, 1.52, 1.53 ati-prefer-radeon-then-r128.patch, 1.1, NONE r128-missing-xf86ForceHWCursor-symbol-bug168753.patch, 1.1, NONE radeon-6.6.1-dotclock-filter.patch, 1.1, NONE radeon-6.6.1-use-mtdriver.patch, 1.2, NONE

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.192-dotclock-filter.patch 
Removed Files:
	ati-prefer-radeon-then-r128.patch 
	r128-missing-xf86ForceHWCursor-symbol-bug168753.patch 
	radeon-6.6.1-dotclock-filter.patch 
	radeon-6.6.1-use-mtdriver.patch 
Log Message:
* Wed Jun 27 2007 Adam Jackson <ajax at redhat.com> 6.6.192-1
- xf86-video-ati 6.6.192.


radeon-6.6.192-dotclock-filter.patch:

--- NEW FILE radeon-6.6.192-dotclock-filter.patch ---
--- xf86-video-ati-6.6.192/src/radeon_display.c.dotclock-filter	2007-05-20 17:20:41.000000000 -0400
+++ xf86-video-ati-6.6.192/src/radeon_display.c	2007-06-27 11:07:55.000000000 -0400
@@ -222,9 +222,15 @@
 {
     MonPtr      mon = pScrn->monitor;
     xf86MonPtr  ddc = mon->DDC;
-    int         i;
+    int         i, clock;
 
-    if (flag) { /* HSync */
+    (void)flag;
+
+    clock = ddc->det_mon[i].section.ranges.max_clock * 1000;
+    if (clock < pScrn->monitor->maxPixClock || !pScrn->monitor->maxPixClock)
+	pScrn->monitor->maxPixClock = clock;
+
+    if (pScrn->monitor->nHsync <= 0) {
 	for (i = 0; i < 4; i++) {
 	    if (ddc->det_mon[i].type == DS_RANGES) {
 		mon->nHsync = 1;
@@ -270,7 +276,8 @@
 	    i++;
 	}
 	mon->nHsync = i;
-    } else {  /* Vrefresh */
+    }
+    if (pScrn->monitor->nVrefresh <= 0) {
 	for (i = 0; i < 4; i++) {
 	    if (ddc->det_mon[i].type == DS_RANGES) {
 		mon->nVrefresh = 1;
--- xf86-video-ati-6.6.192/src/radeon_driver.c.dotclock-filter	2007-05-20 17:20:14.000000000 -0400
+++ xf86-video-ati-6.6.192/src/radeon_driver.c	2007-06-27 11:08:47.000000000 -0400
@@ -2115,10 +2115,7 @@
          * additional way to auto-detect sync ranges if they haven't
          * been added to XF86Config manually.
          */
-        if (pScrn->monitor->nHsync <= 0)
-            RADEONSetSyncRangeFromEdid(pScrn, 1);
-        if (pScrn->monitor->nVrefresh <= 0)
-            RADEONSetSyncRangeFromEdid(pScrn, 0);
+        RADEONSetSyncRangeFromEdid(pScrn, 0);
     }
 
     /* Get mode information */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Nov 2006 22:07:49 -0000	1.13
+++ .cvsignore	27 Jun 2007 15:34:57 -0000	1.14
@@ -1 +1 @@
-xf86-video-ati-6.6.3.tar.bz2
+xf86-video-ati-6.6.192.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Nov 2006 22:07:49 -0000	1.13
+++ sources	27 Jun 2007 15:34:57 -0000	1.14
@@ -1 +1 @@
-f6d559f9d20f61567d381916b376590f  xf86-video-ati-6.6.3.tar.bz2
+f34e42bec3913fe22c124547228d8dba  xf86-video-ati-6.6.192.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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-drv-ati.spec	19 Jun 2007 15:41:40 -0000	1.52
+++ xorg-x11-drv-ati.spec	27 Jun 2007 15:34:57 -0000	1.53
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.6.3
-Release:   4%{?dist}
+Version:   6.6.192
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,23 +16,15 @@
 Source2:   r128.xinf
 Source3:   radeon.xinf
 
-# Base FC6 section
 # Radeon patches (0-99)
-Patch0:	    radeon-6.6.1-dotclock-filter.patch
-Patch1:	    radeon-6.6.1-use-mtdriver.patch
+Patch0:	    radeon-6.6.192-dotclock-filter.patch
 Patch2:     radeon-6.6.3-renderaccel-buglet.patch
 
 # Rage 128 patches (100-199)
-Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
 
 # mach64 patches (200-299)
 
 # ati wrapperloader patches (300-399)
-Patch300: ati-prefer-radeon-then-r128.patch
-
-# Rage128 patches (2000-2999)
-# mach64 patches (3000-3999)
-# ati wrapperloader patches (4000-4999)
 
 ExcludeArch: s390 s390x
 
@@ -50,10 +42,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .dotclock-filter
-%patch1 -p1 -b .mtdriver
 %patch2 -p1 -b .renderaccel
-%patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
-%patch300 -p1 -b .prefer
 
 %build
 %configure --disable-static
@@ -78,6 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc README.ati README.r128
 %{driverdir}/ati_drv.so
 %{driverdir}/atimisc_drv.so
 %{driverdir}/r128_drv.so
@@ -93,6 +83,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Jun 27 2007 Adam Jackson <ajax at redhat.com> 6.6.192-1
+- xf86-video-ati 6.6.192.
+
 * Tue Jun 19 2007 Adam Jackson <ajax at redhat.com> 6.6.3-4
 - radeon-6.6.3-renderaccel-buglet.patch: Fix OpenOffice font corruption
   when RenderAccel is disabled. (#244675)


--- ati-prefer-radeon-then-r128.patch DELETED ---


--- r128-missing-xf86ForceHWCursor-symbol-bug168753.patch DELETED ---


--- radeon-6.6.1-dotclock-filter.patch DELETED ---


--- radeon-6.6.1-use-mtdriver.patch DELETED ---