[pkgsrc/trunk]: pkgsrc/x11/xf86-video-nv patch-a{a,b}: Match PCI id for GeFor...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0c045c3d6ea
branches:  trunk
changeset: 558699:e0c045c3d6ea
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue May 12 13:20:41 2009 +0000

description:
patch-a{a,b}: Match PCI id for GeForce 7000M.
>From http://people.freebsd.org/~ariff/ports/xf86-video-nv/patch-xzz
via Alexey Lebedev on pkgsrc-users@.

diffstat:

 x11/xf86-video-nv/Makefile         |   3 ++-
 x11/xf86-video-nv/distinfo         |   4 +++-
 x11/xf86-video-nv/patches/patch-aa |  28 ++++++++++++++++++++++++++++
 x11/xf86-video-nv/patches/patch-ab |  28 ++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 2 deletions(-)

diffs (88 lines):

diff -r 5a45126433bc -r e0c045c3d6ea x11/xf86-video-nv/Makefile
--- a/x11/xf86-video-nv/Makefile        Tue May 12 12:55:30 2009 +0000
+++ b/x11/xf86-video-nv/Makefile        Tue May 12 13:20:41 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/05/07 13:25:44 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/12 13:20:41 tnn Exp $
 
 DISTNAME=      xf86-video-nv-2.1.13
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 5a45126433bc -r e0c045c3d6ea x11/xf86-video-nv/distinfo
--- a/x11/xf86-video-nv/distinfo        Tue May 12 12:55:30 2009 +0000
+++ b/x11/xf86-video-nv/distinfo        Tue May 12 13:20:41 2009 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.12 2009/05/07 13:25:44 tnn Exp $
+$NetBSD: distinfo,v 1.13 2009/05/12 13:20:41 tnn Exp $
 
 SHA1 (xf86-video-nv-2.1.13.tar.bz2) = 47aa26d8d21773eb5d03a931482a87a75d9168ab
 RMD160 (xf86-video-nv-2.1.13.tar.bz2) = 8b5a0259996ef867ec622cc4c555ff83aaef6ee0
 Size (xf86-video-nv-2.1.13.tar.bz2) = 397630 bytes
+SHA1 (patch-aa) = 29d1ab1e4b1a3483393f838b67d2ca1207f77e79
+SHA1 (patch-ab) = 406f8233b47222e18ecad8288388122eadd1e0e6
diff -r 5a45126433bc -r e0c045c3d6ea x11/xf86-video-nv/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-nv/patches/patch-aa        Tue May 12 13:20:41 2009 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.4 2009/05/12 13:20:41 tnn Exp $
+
+--- src/nv_driver.c.orig       2009-04-07 19:33:51.000000000 +0200
++++ src/nv_driver.c
+@@ -365,6 +365,7 @@ static SymTabRec NVKnownChipsets[] =
+   { 0x10DE0242, "GeForce 6100" },
+   { 0x10DE0244, "GeForce Go 6150" },
+   { 0x10DE0247, "GeForce Go 6100" },
++  { 0x10DE0533, "GeForce 7000M" },
+ 
+ /*************** G8x ***************/
+   { 0x10DE0191, "GeForce 8800 GTX" },
+@@ -844,6 +845,7 @@ NVIsSupported(CARD32 id)
+     case 0x0340:
+     case 0x0390:
+     case 0x03D0:
++    case 0x0530:
+         return TRUE;
+     }
+ 
+@@ -1772,6 +1774,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+     case 0x0390:   /* GeForce 7600 */
+     case 0x0240:   /* GeForce 6100 */
+     case 0x03D0:
++    case 0x0530:   /* GeForce 7000M */
+          pNv->Architecture =  NV_ARCH_40;
+          break;
+     default:
diff -r 5a45126433bc -r e0c045c3d6ea x11/xf86-video-nv/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-nv/patches/patch-ab        Tue May 12 13:20:41 2009 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2009/05/12 13:20:41 tnn Exp $
+
+--- src/nv_hw.c.orig   2008-10-27 22:54:04.000000000 +0100
++++ src/nv_hw.c
+@@ -890,6 +890,7 @@ void NVCalcStateExt (
+         case NV_ARCH_30:
+         default:
+             if(((pNv->Chipset & 0xfff0) == 0x0240) ||
++             ((pNv->Chipset & 0xfff0) == 0x0530) ||
+                ((pNv->Chipset & 0xfff0) == 0x03D0))
+             {
+                 state->arbitration0 = 128; 
+@@ -1226,6 +1227,7 @@ void NVLoadStateExt (
+               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,6 +1318,7 @@ void NVLoadStateExt (
+                    pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i];
+                    if(((pNv->Chipset & 0xfff0) != 0x0160) &&
+                       ((pNv->Chipset & 0xfff0) != 0x0220) &&
++                      ((pNv->Chipset & 0xfff0) != 0x0530) &&
+                       ((pNv->Chipset & 0xfff0) != 0x0240))
+                    {
+                       pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i];