rpms/xorg-x11-drv-nv/devel nv-2.0.0-hang-fix.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.35, 1.36

[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-serv26577

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.0.0-hang-fix.patch 
Log Message:
* Tue Mar 20 2007 Adam Jackson <ajax at redhat.com> 2.0.0-2
- nv-2.0.0-hang-fix.patch: Fix a hang during initialization.


nv-2.0.0-hang-fix.patch:
 nv_driver.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE nv-2.0.0-hang-fix.patch ---
From: Aaron Plattner <aplattner at nvidia.com>
Date: Mon, 19 Mar 2007 19:00:36 +0000 (-0700)
Subject: NVSync hangs in EnterVT, so don't call it there.
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-nv.git;a=commitdiff;h=16f51977d49e52079754b62f4a13754e56da1c9c

NVSync hangs in EnterVT, so don't call it there.
---

--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -816,7 +816,10 @@ NVProbe(DriverPtr drv, int flags)
 Bool
 NVSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 {
-    return NVModeInit(xf86Screens[scrnIndex], mode);
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+
+    NVSync(pScrn);
+    return NVModeInit(pScrn, mode);
 }
 
 /*
@@ -1736,8 +1739,6 @@ NVModeInit(ScrnInfoPtr pScrn, DisplayMod
     NVPtr pNv = NVPTR(pScrn);
     NVRegPtr nvReg;
 
-    NVSync(pScrn);
-
     /* Initialise the ModeReg values */
     if (!vgaHWInit(pScrn, mode))
 	return 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-drv-nv.spec	19 Mar 2007 17:49:16 -0000	1.35
+++ xorg-x11-drv-nv.spec	20 Mar 2007 19:10:46 -0000	1.36
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.0.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -25,8 +25,9 @@
 
 Requires:  xorg-x11-server-Xorg >= 1.1.0-12
 
-Patch0:    nv-1.1.1-nv34-tweaks.patch
-Patch2:	   nv-1.2.0-panel-range-hack.patch
+Patch0:     nv-1.1.1-nv34-tweaks.patch
+Patch2:	    nv-1.2.0-panel-range-hack.patch
+Patch3:	    nv-2.0.0-hang-fix.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -36,6 +37,7 @@
 
 %patch0 -p1 -b .nv34-tweak
 %patch2 -p1 -b .range-hack
+%patch3 -p1 -b .nvsync
 
 tar jxf %{SOURCE1}
 
@@ -72,6 +74,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Mar 20 2007 Adam Jackson <ajax at redhat.com> 2.0.0-2
+- nv-2.0.0-hang-fix.patch: Fix a hang during initialization.
+
 * Mon Mar 19 2007 Adam Jackson <ajax at redhat.com> 2.0.0-1
 - Update to 2.0.0.