rpms/xorg-x11-drv-nv/devel nv-2.1.12-gf7025-gf7050.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.80, 1.81

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.12-gf7025-gf7050.patch 
Log Message:
add support for gf7025/7050

nv-2.1.12-gf7025-gf7050.patch:

--- NEW FILE nv-2.1.12-gf7025-gf7050.patch ---
diff -Naur xf86-video-nv-2.1.12.orig/src/nv_driver.c xf86-video-nv-2.1.12/src/nv_driver.c
--- xf86-video-nv-2.1.12.orig/src/nv_driver.c	2008-08-26 22:46:19.000000000 +0200
+++ xf86-video-nv-2.1.12/src/nv_driver.c	2009-01-28 21:10:42.000000000 +0100
@@ -354,6 +354,9 @@
   { 0x10DE0244, "GeForce Go 6150" },
   { 0x10DE0247, "GeForce Go 6100" },
 
+  { 0x10DE053E, "GeForce 7025" },
+  { 0x10DE053B, "GeForce 7050" },
+
 /*************** G8x ***************/
   { 0x10DE0191, "GeForce 8800 GTX" },
   { 0x10DE0193, "GeForce 8800 GTS" },
@@ -832,6 +835,7 @@
     case 0x0340:
     case 0x0390:
     case 0x03D0:
+    case 0x0530:
         return TRUE;
     }
 
@@ -1759,6 +1765,7 @@
     case 0x0290:   /* GeForce 7900 */
     case 0x0390:   /* GeForce 7600 */
     case 0x0240:   /* GeForce 6100 */
+    case 0x0530:   /* GeForce 7050, 7025 */
     case 0x03D0:
          pNv->Architecture =  NV_ARCH_40;
          break;
diff -Naur xf86-video-nv-2.1.12.orig/src/nv_hw.c xf86-video-nv-2.1.12/src/nv_hw.c
--- xf86-video-nv-2.1.12.orig/src/nv_hw.c	2008-08-25 18:59:45.000000000 +0200
+++ xf86-video-nv-2.1.12/src/nv_hw.c	2009-01-28 21:06:24.000000000 +0100
@@ -890,7 +890,8 @@
         case NV_ARCH_30:
         default:
             if(((pNv->Chipset & 0xfff0) == 0x0240) ||
-               ((pNv->Chipset & 0xfff0) == 0x03D0))
+               ((pNv->Chipset & 0xfff0) == 0x03D0) ||
+               ((pNv->Chipset & 0xfff0) == 0x0530))
             {
                 state->arbitration0 = 128; 
                 state->arbitration1 = 0x0480; 
@@ -1226,6 +1227,7 @@
               case 0x01D0:
               case 0x0240:
               case 0x03D0:
+              case 0x0530:
                  pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4];
                  pNv->PMC[0x1704/4] = 0;
                  pNv->PMC[0x1708/4] = 0;
@@ -1316,7 +1318,8 @@
                    pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i];
                    if(((pNv->Chipset & 0xfff0) != 0x0160) &&
                       ((pNv->Chipset & 0xfff0) != 0x0220) &&
-                      ((pNv->Chipset & 0xfff0) != 0x0240))
+                      ((pNv->Chipset & 0xfff0) != 0x0240) &&
+                      ((pNv->Chipset & 0xfff0) != 0x0530))
                    {
                       pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i];
                    }


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.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- xorg-x11-drv-nv.spec	22 Dec 2008 02:47:14 -0000	1.80
+++ xorg-x11-drv-nv.spec	17 Feb 2009 01:41:42 -0000	1.81
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -31,6 +31,7 @@
 Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
+Patch10:    nv-2.1.12-gf7025-gf7050.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -44,6 +45,7 @@
 %patch6 -p1 -b .panel
 %patch7 -p1 -b .save-rom
 %patch9 -p1 -b .doublescan
+%patch10 -p1 -b .nv6x
 
 %build
 %configure --disable-static
@@ -70,6 +72,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Feb 17 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.12-8
+- Add support for GeForce 7025/7050 (fdo #22371)
+
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 2.1.12-7
 - rebuild for new server API