[xorg-x11-drv-nv] nv 2.1.20

[Dave Airlie]

commit 9c81d752065c049982a6595b22b940cc4118450f
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 18 03:47:43 2012 -0400

    nv 2.1.20

 nv-2.1.6-starvation.patch |   16 ++++------------
 nv-save-rom.patch         |   16 ++++++++--------
 sources                   |    2 +-
 xorg-x11-drv-nv.spec      |    9 ++++++---
 4 files changed, 19 insertions(+), 24 deletions(-)
---
diff --git a/nv-2.1.6-starvation.patch b/nv-2.1.6-starvation.patch
index ca00e61..89c0ac8 100644
--- a/nv-2.1.6-starvation.patch
+++ b/nv-2.1.6-starvation.patch
@@ -1,15 +1,7 @@
-diff -up xf86-video-nv-2.1.6/src/nv_driver.c.jx xf86-video-nv-2.1.6/src/nv_driver.c
---- xf86-video-nv-2.1.6/src/nv_driver.c.jx	2007-09-26 20:59:50.000000000 -0400
-+++ xf86-video-nv-2.1.6/src/nv_driver.c	2008-01-22 16:11:24.000000000 -0500
-@@ -1148,12 +1148,19 @@ NVFreeScreen(int scrnIndex, int flags)
- static ModeStatus
- NVValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
- {
--    NVPtr pNv = NVPTR(xf86Screens[scrnIndex]);
-+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    NVPtr pNv = NVPTR(pScrn);
- 
-     if(pNv->fpWidth && pNv->fpHeight)
+diff -up xf86-video-nv-2.1.20/src/nv_driver.c.starve xf86-video-nv-2.1.20/src/nv_driver.c
+--- xf86-video-nv-2.1.20/src/nv_driver.c.starve	2012-07-18 03:43:02.000000000 -0400
++++ xf86-video-nv-2.1.20/src/nv_driver.c	2012-07-18 03:44:24.324393469 -0400
+@@ -1279,6 +1279,12 @@ NVValidMode(SCRN_ARG_TYPE arg, DisplayMo
        if((pNv->fpWidth < mode->HDisplay) || (pNv->fpHeight < mode->VDisplay))
          return (MODE_PANEL);
  
diff --git a/nv-save-rom.patch b/nv-save-rom.patch
index 98564ba..0b74b20 100644
--- a/nv-save-rom.patch
+++ b/nv-save-rom.patch
@@ -1,6 +1,6 @@
-diff -up xf86-video-nv-2.1.14/src/g80_driver.c.da xf86-video-nv-2.1.14/src/g80_driver.c
---- xf86-video-nv-2.1.14/src/g80_driver.c.da	2009-08-04 16:03:45.000000000 +1000
-+++ xf86-video-nv-2.1.14/src/g80_driver.c	2009-08-04 16:04:06.000000000 +1000
+diff -up xf86-video-nv-2.1.20/src/g80_driver.c.save-rom xf86-video-nv-2.1.20/src/g80_driver.c
+--- xf86-video-nv-2.1.20/src/g80_driver.c.save-rom	2012-07-17 02:47:02.000000000 -0400
++++ xf86-video-nv-2.1.20/src/g80_driver.c	2012-07-18 03:45:47.633351965 -0400
 @@ -27,6 +27,9 @@
  #endif
  
@@ -11,7 +11,7 @@ diff -up xf86-video-nv-2.1.14/src/g80_driver.c.da xf86-video-nv-2.1.14/src/g80_d
  
  #include <xf86.h>
  #include <xf86_OSproc.h>
-@@ -163,6 +166,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
+@@ -167,6 +170,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
      char *s;
      CARD32 tmp;
      memType BAR1sizeKB;
@@ -19,7 +19,7 @@ diff -up xf86-video-nv-2.1.14/src/g80_driver.c.da xf86-video-nv-2.1.14/src/g80_d
  
      if(flags & PROBE_DETECT)
          return TRUE;
-@@ -390,6 +394,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
+@@ -394,6 +398,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
      else
          pNv->table1 -= 0x10000;
  
@@ -34,12 +34,12 @@ diff -up xf86-video-nv-2.1.14/src/g80_driver.c.da xf86-video-nv-2.1.14/src/g80_d
      xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
      xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
  
-@@ -939,6 +951,8 @@ G80EnterVT(int scrnIndex, int flags)
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+@@ -918,6 +930,8 @@ G80EnterVT(VT_FUNC_ARGS_DECL)
+     SCRN_INFO_PTR(arg);
      G80Ptr pNv = G80PTR(pScrn);
  
 +    G80DispPreInit(pScrn);
 +
      /* Reinit the hardware */
+ #ifdef HAVE_XAA_H
      if(pNv->xaa)
-         G80InitHW(pScrn);
diff --git a/sources b/sources
index 23e9998..642895f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b12f0b2114849d1a542d8084732573d3  xf86-video-nv-2.1.18.tar.bz2
+e263dd0cd149b5224e92baa5a227bb00  xf86-video-nv-2.1.20.tar.bz2
diff --git a/xorg-x11-drv-nv.spec b/xorg-x11-drv-nv.spec
index c3a1e67..ee60906 100644
--- a/xorg-x11-drv-nv.spec
+++ b/xorg-x11-drv-nv.spec
@@ -3,9 +3,9 @@
 %define driverdir	%{moduledir}/drivers
 
 Summary:   Xorg X11 nv video driver
-Name:      xorg-x11-drv-nv
-Version:   2.1.18
-Release:   16%{?dist}
+Name:      xorg-x11-drv-nvA
+Version:   2.1.20
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 2.1.20-1
+- nv 2.1.20
+
 * Thu Apr 05 2012 Adam Jackson <ajax at redhat.com> - 2.1.18-16
 - RHEL arch exclude updates