xf86-video-nv: 3 commits - configure.ac man/nv.man src/g80_driver.c src/nv_driver.c

[Aaron Plattner]

 configure.ac     |    2 +-
 man/nv.man       |    4 ++--
 src/g80_driver.c |    4 ++--
 src/nv_driver.c  |   14 +++++++++++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 71321d0ddecf1ab5327c754353d31db5d1f3c6bf
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Mar 8 13:34:20 2010 -0800

    nv 2.1.17
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/configure.ac b/configure.ac
index 6b997f2..d717805 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-nv],
-        2.1.16,
+        2.1.17,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-nv)
 
commit 467f0f3890622e57607b103b07e4f265cf999b1e
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Mar 8 13:16:26 2010 -0800

    More products
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Andy Ritger <ARitger at nvidia.com>

diff --git a/man/nv.man b/man/nv.man
index 9bbe5cd..d7d8ae9 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -59,8 +59,8 @@ NV40, NV41, NV43, NV44, NV45, C51
 .B GeForce 7XXX
 G70, G71, G72, G73
 .TP 22
-.B GeForce 8XXX, GeForce 9XXX, GeForce G, ION
-G80, G84, G86, G92, G94, G96, G98, GT215, GT216, GT218, MCP79, MCP7A
+.B GeForce 8XXX, GeForce 9XXX, nForce 7, GeForce G, ION
+G8x, G9x, GT21x, MCP7x
 .TP 22
 .B GeForce GTX
 GT200
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 707e994..31fe78b 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/03 */
+/* Known cards as of 2010/03/08 */
 
 static SymTabRec NVKnownChipsets[] =
 {
@@ -496,6 +496,16 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE06F9, "Quadro FX 370 LP" },
   { 0x10DE06FA, "Quadro NVS 450" },
   { 0x10DE06FD, "Quadro NVS 295" },
+  { 0x10DE0847, "GeForce 9100" },
+  { 0x10DE0848, "GeForce 8300" },
+  { 0x10DE0849, "GeForce 8200" },
+  { 0x10DE084A, "nForce 730a" },
+  { 0x10DE084B, "GeForce 9200" },
+  { 0x10DE084C, "nForce 980a/780a SLI" },
+  { 0x10DE084D, "nForce 750a SLI" },
+  { 0x10DE084F, "GeForce 8100 / nForce 720a" },
+  { 0x10DE0844, "GeForce 9100M G" },
+  { 0x10DE0845, "GeForce 8200M G" },
   { 0x10DE0861, "GeForce 9400" },
   { 0x10DE0862, "GeForce 9400M G" },
   { 0x10DE0863, "GeForce 9400M" },
@@ -763,6 +773,8 @@ NVIsG80(int chipType)
         case 0x0650:
         case 0x06e0:
         case 0x06f0:
+        case 0x0840:
+        case 0x0850:
         case 0x0860:
         case 0x0870:
         case 0x0a20:
commit e34a53167d6a142949b3e0258dc336dc297368aa
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Mar 5 14:27:31 2010 -0800

    G80: Cast register reads before shifting them to avoid truncation to 32 bits.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/src/g80_driver.c b/src/g80_driver.c
index 324e180..abdb37e 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -615,8 +615,8 @@ G80InitHW(ScrnInfoPtr pScrn)
     pNv->reg[0x00706460/4] = 0x0000502d;
     pNv->reg[0x00706474/4] = 0x00010000;
     if(pNv->architecture == 0xaa || pNv->architecture == 0xac) {
-        uint64_t base = pNv->reg[0x00100E10/4] << 12;
-        size_t size = pNv->reg[0x00100E14/4] << 12;
+        uint64_t base = (uint64_t)pNv->reg[0x00100E10/4] << 12;
+        size_t size = (uint64_t)pNv->reg[0x00100E14/4] << 12;
         uint64_t limit = base + size - G80_RESERVED_VIDMEM;
 
         pNv->reg[0x00706480/4] = 0x1a003d;