patch for x11/xf86-video-nv

[Alexey Lebedev <realzhtw%gmail.com@localhost>]

Hello!

I'm using laptop with nVidia GeForce 7150M video card which is not
supported by xf86-video-nv by default.
But there is a patch from Ariff Abdullah which worked to me very well:
http://people.freebsd.org/~ariff/ports/xf86-video-nv/

I think it's good to incorporate it in pkgsrc. Isn't it?

I did "make extract", applied the patch and then did "mkpatched -d
patches" and "make distinfo".

That's what I've got:

avl@ikemefuna:/usr/pkgsrc/x11/xf86-video-nv$ cvs diff
? patches
cvs diff: Diffing .
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xf86-video-nv/distinfo,v
retrieving revision 1.11
diff -r1.11 distinfo
5a6,7
> SHA1 (patch-aa) = dfffff349edb18fdfef784c25ee21c73a20d1a6f
> SHA1 (patch-ab) = 2de6f8ee237ad24ba37e7c3d40d08b38c114845c

avl@ikemefuna:/usr/pkgsrc/x11/xf86-video-nv$ cat patches/patch-aa
$NetBSD$

--- src/nv_driver.c.orig        2008-08-27 00:46:19.000000000 +0400
+++ src/nv_driver.c
@@ -353,6 +353,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE0242, "GeForce 6100" },
   { 0x10DE0244, "GeForce Go 6150" },
   { 0x10DE0247, "GeForce Go 6100" },
+  { 0x10DE0533, "GeForce 7000M" },

 /*************** G8x ***************/
   { 0x10DE0191, "GeForce 8800 GTX" },
@@ -832,6 +833,7 @@ NVIsSupported(CARD32 id)
     case 0x0340:
     case 0x0390:
     case 0x03D0:
+    case 0x0530:
         return TRUE;
     }

@@ -1760,6 +1762,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:
avl@ikemefuna:/usr/pkgsrc/x11/xf86-video-nv$ cat patches/patch-ab
$NetBSD$

--- src/nv_hw.c.orig    2008-08-25 20:59:45.000000000 +0400
+++ 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];


xf86-video-nv is built well and works well to me now.

--
Alexey Lebedev