6547110 Update to xf86-video-nv 2.0.2 for GeForce 8500/8600 support nv_64
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Thu, 19 Apr 2007 17:32:14 -0700
changeset 146 fc0a5935d8d7
parent 145 0961450d76a6
child 147 d4238df4114f
6547110 Update to xf86-video-nv 2.0.2 for GeForce 8500/8600 support
open-src/driver/xf86-video-nv/6536127.patch
open-src/driver/xf86-video-nv/Makefile
--- a/open-src/driver/xf86-video-nv/6536127.patch	Thu Apr 19 17:30:35 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
---- src/nv_driver.c.orig	Fri Mar 23 14:38:31 2007
-+++ src/nv_driver.c	Fri Mar 23 14:40:58 2007
-@@ -35,6 +35,8 @@
- 
- #include "xf86int10.h"
- 
-+extern DisplayModePtr xf86ModesAdd(DisplayModePtr Modes, DisplayModePtr Additions);
-+
- const   OptionInfoRec * RivaAvailableOptions(int chipid, int busid);
- Bool    RivaGetScrnInfoRec(PciChipsets *chips, int chip);
- Bool    G80GetScrnInfoRec(PciChipsets *chips, int chip);
-@@ -1027,6 +1029,7 @@
-     int i, max_width, max_height;
-     ClockRangePtr clockRanges;
-     const char *s;
-+    int config_mon_rates;
- 
-     if (flags & PROBE_DETECT) {
-         EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
-@@ -1484,6 +1487,12 @@
-     pNv->alphaCursor = (pNv->Architecture >= NV_ARCH_10) &&
-                        ((pNv->Chipset & 0x0ff0) != 0x0100);
- 
-+    if ((pScrn->monitor->nHsync == 0) && 
-+	(pScrn->monitor->nVrefresh == 0))
-+	config_mon_rates = FALSE;
-+    else
-+	config_mon_rates = TRUE;
-+
-     NVCommonSetup(pScrn);
- 
-     if (pNv->FBDev) {
-@@ -1553,6 +1562,36 @@
-        max_height = 4096;
-     }
- 
-+    /* If DFP, add a modeline corresponding to its panel size */
-+    if (pNv->FlatPanel && !pNv->Television && pNv->fpWidth && pNv->fpHeight) {
-+	DisplayModePtr Mode;
-+
-+	Mode = xnfcalloc(1, sizeof(DisplayModeRec));
-+	Mode = xf86CVTMode(pNv->fpWidth, pNv->fpHeight, 60.00, TRUE, FALSE);
-+	Mode->type = M_T_DRIVER;
-+	pScrn->monitor->Modes = xf86ModesAdd(pScrn->monitor->Modes, Mode);
-+
-+	if (!config_mon_rates) {
-+	    if (!Mode->HSync)
-+            	Mode->HSync = ((float) Mode->Clock ) / ((float) Mode->HTotal);
-+            if (!Mode->VRefresh)
-+            	Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) /
-+                    ((float) (Mode->HTotal * Mode->VTotal));
-+
-+ 	    if (Mode->HSync < pScrn->monitor->hsync[0].lo)
-+            	pScrn->monitor->hsync[0].lo = Mode->HSync;
-+            if (Mode->HSync > pScrn->monitor->hsync[0].hi)
-+            	pScrn->monitor->hsync[0].hi = Mode->HSync;
-+            if (Mode->VRefresh < pScrn->monitor->vrefresh[0].lo)
-+            	pScrn->monitor->vrefresh[0].lo = Mode->VRefresh;
-+            if (Mode->VRefresh > pScrn->monitor->vrefresh[0].hi)
-+            	pScrn->monitor->vrefresh[0].hi = Mode->VRefresh;
-+
-+	    pScrn->monitor->nHsync = 1;
-+	    pScrn->monitor->nVrefresh = 1;
-+	}
-+    }
-+
-     /*
-      * xf86ValidateModes will check that the mode HTotal and VTotal values
-      * don't exceed the chipset's limit if pScrn->maxHValue and
--- a/open-src/driver/xf86-video-nv/Makefile	Thu Apr 19 17:30:35 2007 -0700
+++ b/open-src/driver/xf86-video-nv/Makefile	Thu Apr 19 17:32:14 2007 -0700
@@ -30,17 +30,17 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.8	07/03/23
+# @(#)Makefile	1.9	07/04/19
 #
 
 # Package name used in tarballs
 DRIVER_NAME=xf86-video-nv
 
 # Version number (used in path names)
-DRIVER_VERS=2.0.0
+DRIVER_VERS=2.0.2
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6536127.patch
+SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
@@ -58,5 +58,3 @@
 
 include ../Makefile.inc
 
-source_gen:: $(UNPACK_TARGET)
-	(cd $(SOURCE_DIR) && automake)