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

[Aaron Plattner]

 src/g80_output.c |    5 +++--
 src/nv_driver.c  |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 29acf7c970d12c1dfd7bf6c7a42fe2448aa7f3d7
Author: Yinan Shen <shenyn321 at gmail.com>
Date:   Wed May 6 19:14:33 2009 -0700

    G80: Fix incorrect I2C port access for ports above 3.

diff --git a/src/g80_output.c b/src/g80_output.c
index 420a73e..75bf7ba 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -217,8 +217,9 @@ fail:
 
 static CARD32 i2cAddr(const int port)
 {
-    const CARD32 base = (port > 3) ? 0x0000E1E0 : 0x0000E138;
-    return base + port * 0x18;
+    const CARD32 base = (port > 3) ? 0x0000E1D4 : 0x0000E138;
+    const CARD32 offset = (port > 3) ? 0x20 : 0x18;
+    return base + port * offset;
 }
 
 static void G80_I2CPutBits(I2CBusPtr b, int clock, int data)
commit bf18cd4842c33df61b03c3d4e0f00e34485fb957
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue May 5 01:29:08 2009 -0700

    Fix a dumb typo in the chip name entry for the GeForce 9800 GTX+

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 20f96fb..223ac8e 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -415,7 +415,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE0610, "GeForce 9600 GSO" },
   { 0x10DE0611, "GeForce 8800 GT" },
   { 0x10DE0612, "GeForce 9800 GTX" },
-  { 0x10DE0613, "GeForce 9800 GTK+" },
+  { 0x10DE0613, "GeForce 9800 GTX+" },
   { 0x10DE0614, "GeForce 9800 GT" },
   { 0x10DE061A, "Quadro FX 3700" },
   { 0x10DE061C, "Quadro FX 3600M" },