rpms/xorg-x11-drv-nv/devel nv-1.2.0-panel-range-hack.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.26, 1.27

[fedora-cvs-commits at redhat.com]

Author: ajackson

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

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-1.2.0-panel-range-hack.patch 
Log Message:
* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-4.fc6
- nv-1.2.0-panel-range-hack: If we detect a panel, but don't get DDC, adjust
  the monitor's sync ranges to accomodate a 60Hz mode at the panel's
  native resolution.


nv-1.2.0-panel-range-hack.patch:
 nv_setup.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+)

--- NEW FILE nv-1.2.0-panel-range-hack.patch ---
--- xf86-video-nv-1.2.0/src/nv_setup.c.jx	2006-06-16 20:48:53.000000000 -0400
+++ xf86-video-nv-1.2.0/src/nv_setup.c	2006-08-29 18:11:03.000000000 -0400
@@ -690,6 +690,26 @@ NVCommonSetup(ScrnInfoPtr pScrn)
 
     if(monitorA)
       xf86SetDDCproperties(pScrn, monitorA);
+    else if (pNv->FlatPanel) {
+	float hsync, vsync;
+	DisplayModePtr mode =
+	    xf86CVTMode(pNv->fpWidth, pNv->fpHeight, 61, 0, 0);
+	hsync = (float)mode->Clock / (float)mode->HTotal;
+	vsync = mode->Clock * 1000.0 / mode->HTotal / mode->VTotal;
+	if (!pScrn->monitor->nHsync && hsync > 31.5) {
+	    pScrn->monitor->hsync[0].lo = 31.5;
+	    pScrn->monitor->hsync[0].hi = hsync;
+	    pScrn->monitor->nHsync++;
+	}
+	if (!pScrn->monitor->nVrefresh && vsync > 50.0) {
+	    pScrn->monitor->vrefresh[0].lo = 50.0;
+	    pScrn->monitor->vrefresh[0].hi = vsync;
+	    pScrn->monitor->nVrefresh++;
+	}
+	if (mode->Clock > pScrn->monitor->maxPixClock)
+	    pScrn->monitor->maxPixClock = mode->Clock;
+	xfree(mode);
+    }
 
     if(!pNv->FlatPanel || (pScrn->depth != 24) || !pNv->twoHeads)
         pNv->FPDither = FALSE;


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-nv.spec	3 Aug 2006 02:44:16 -0000	1.26
+++ xorg-x11-drv-nv.spec	31 Aug 2006 18:16:35 -0000	1.27
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -19,12 +19,13 @@
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.1.0-1
+BuildRequires: xorg-x11-server-sdk >= 1.1.0-12
 
-Requires:  xorg-x11-server-Xorg >= 1.1.0-1
+Requires:  xorg-x11-server-Xorg >= 1.1.0-12
 
 Patch0:    nv-1.1.1-nv34-tweaks.patch
 Patch1:    nv-1.1.2-panel-message.patch
+Patch2:	   nv-1.2.0-panel-range-hack.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -34,6 +35,7 @@
 
 %patch0 -p1 -b .nv34-tweak
 %patch1 -p1 -b .panel-message
+%patch2 -p1 -b .range-hack
 
 %build
 %configure --disable-static
@@ -65,6 +67,11 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-4.fc6
+- nv-1.2.0-panel-range-hack: If we detect a panel, but don't get DDC, adjust
+  the monitor's sync ranges to accomodate a 60Hz mode at the panel's
+  native resolution.
+
 * Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-3.fc6
 - Bump for upgrade path from FC5.