xf86-video-nv: 2 commits - man/nv.man src/nv_driver.c src/nv_hw.c

[Aaron Plattner]

 man/nv.man      |    2 +-
 src/nv_driver.c |   10 +++++++++-
 src/nv_hw.c     |    7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 250a3a7cee1a4bbfc432ab6da5b986e889207526
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Mar 10 18:31:08 2010 -0800

    Update MCP6x supported products.
    
    Use the official names for 10DE:053B and 10DE:053E.  Add some additional
    product IDs and update the documentation.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/man/nv.man b/man/nv.man
index d7d8ae9..228f1da 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -57,7 +57,7 @@ NV30, NV31, NV34, NV35, NV36, NV37, NV38
 NV40, NV41, NV43, NV44, NV45, C51
 .TP 22
 .B GeForce 7XXX
-G70, G71, G72, G73
+G70, G71, G72, G73, MCP6x
 .TP 22
 .B GeForce 8XXX, GeForce 9XXX, nForce 7, GeForce G, ION
 G8x, G9x, GT21x, MCP7x
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 99d172f..0d017f9 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -125,7 +125,7 @@ _X_EXPORT DriverRec NV = {
 #endif
 };
 
-/* Known cards as of 2010/03/08 */
+/* Known cards as of 2010/03/10 */
 
 static SymTabRec NVKnownChipsets[] =
 {
@@ -380,8 +380,11 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE03D2, "GeForce 6100 nForce 400" },
   { 0x10DE03D5, "GeForce 6100 nForce 420" },
 
-  { 0x10DE053E, "GeForce 7025" },
-  { 0x10DE053B, "GeForce 7050" },
+  { 0x10DE0531, "GeForce 7150M / nForce 630M" },
+  { 0x10DE0533, "GeForce 7000M / nForce 610M" },
+  { 0x10DE053A, "GeForce 7050 PV / nForce 630a" },
+  { 0x10DE053B, "GeForce 7050 PV / nForce 630a" },
+  { 0x10DE053E, "GeForce 7025 / nForce 630a" },
 
 /*************** G8x ***************/
   { 0x10DE0191, "GeForce 8800 GTX" },
commit 347625b8e187c4ab696cd1dad95e49c31ced12f6
Author: Markus Strobl <markus.strobl at gmx.at>
Date:   Wed Mar 10 18:26:33 2010 -0800

    Bug #19817: Add support for GeForce 7025 and 7050.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 31fe78b..99d172f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -380,6 +380,9 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE03D2, "GeForce 6100 nForce 400" },
   { 0x10DE03D5, "GeForce 6100 nForce 420" },
 
+  { 0x10DE053E, "GeForce 7025" },
+  { 0x10DE053B, "GeForce 7050" },
+
 /*************** G8x ***************/
   { 0x10DE0191, "GeForce 8800 GTX" },
   { 0x10DE0193, "GeForce 8800 GTS" },
@@ -817,6 +820,7 @@ NVIsSupported(CARD32 id)
     case 0x0340:
     case 0x0390:
     case 0x03D0:
+    case 0x0530:
         return TRUE;
     }
 
@@ -1741,6 +1745,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
     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 --git a/src/nv_hw.c b/src/nv_hw.c
index 83eeab2..9291912 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -890,7 +890,8 @@ void NVCalcStateExt (
         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 @@ 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,7 +1318,8 @@ void NVLoadStateExt (
                    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];
                    }