rpms/xorg-x11-drv-nv/devel nv-save-rom.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.69, 1.70

[Matthew Garrett (mjg59)]

Author: mjg59

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

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-save-rom.patch 
Log Message:
* Tue May 20 2008 Matthew Garrett <mjg at redhat.com> 2.1.8-2
- nv-save-rom.patch: save the rom at startup on g80s to allow them to be 
  rePOSTed on resume.


nv-save-rom.patch:

--- NEW FILE nv-save-rom.patch ---
Only in xf86-video-nv-2.1.8: ChangeLog
Only in xf86-video-nv-2.1.8.new/compat: Makefile
Only in xf86-video-nv-2.1.8.new/: config.h
Only in xf86-video-nv-2.1.8.new/: config.log
Only in xf86-video-nv-2.1.8.new/: config.status
Only in xf86-video-nv-2.1.8.new/: libtool
Only in xf86-video-nv-2.1.8.new/: Makefile
Only in xf86-video-nv-2.1.8.new/man: Makefile
Only in xf86-video-nv-2.1.8.new/src: .deps
diff -ur xf86-video-nv-2.1.8/src/g80_driver.c xf86-video-nv-2.1.8.new/src/g80_driver.c
--- xf86-video-nv-2.1.8/src/g80_driver.c	2008-03-06 20:33:15.000000000 +0000
+++ xf86-video-nv-2.1.8.new/src/g80_driver.c	2008-05-16 18:41:31.000000000 +0100
@@ -28,6 +28,10 @@
 
 #include <string.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <xf86_OSproc.h>
 #include <xf86Resources.h>
 #include <xf86RandR12.h>
@@ -203,6 +207,7 @@
     char *s;
     CARD32 tmp;
     memType BAR1sizeKB;
+    int fd;
 
     if(flags & PROBE_DETECT) {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -429,6 +434,14 @@
     else
         pNv->table1 -= 0x10000;
 
+    /* Gag me with a horse */
+
+    fd = open ("/var/run/video.rom", O_CREAT|O_RDWR|O_EXCL, 0700);
+    if(fd != -1) {
+	write (fd, pNv->table1, 0x10000);
+	close (fd);
+    }
+
     xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
     xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
 
@@ -984,6 +997,8 @@
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
     G80Ptr pNv = G80PTR(pScrn);
 
+    G80DispPreInit(pScrn);
+
     /* Reinit the hardware */
     if(pNv->xaa)
         G80InitHW(pScrn);
Only in xf86-video-nv-2.1.8.new/src: g80_driver.c~
Only in xf86-video-nv-2.1.8.new/src: Makefile
Only in xf86-video-nv-2.1.8.new/: stamp-h1


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xorg-x11-drv-nv.spec	7 Mar 2008 14:47:53 -0000	1.69
+++ xorg-x11-drv-nv.spec	20 May 2008 18:01:54 -0000	1.70
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.8
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -29,6 +29,7 @@
 Patch4:     nv-reserve-fbarea.patch
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
+Patch7:	    nv-save-rom.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -41,6 +42,7 @@
 %patch4 -p1 -b .reserve-fbarea
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
+%patch7 -p1 -b .save-rom
 
 %build
 %configure --disable-static
@@ -67,6 +69,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue May 20 2008 Matthew Garrett <mjg at redhat.com> 2.1.8-2
+- nv-save-rom.patch: save the rom at startup on g80s to allow them to be 
+  rePOSTed on resume.
+
 * Fri Mar 07 2008 Adam Jackson <ajax at redhat.com> 2.1.8-1
 - nv 2.1.8