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

[Aaron Plattner]

 src/g80_driver.c |    1 +
 src/g80_output.c |    3 ++-
 src/g80_sor.c    |    5 +++--
 src/nv_driver.c  |    1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
diff-tree c1503c864d495f8a3e5380fed5cb8ca5e21a3750 (from 42dffde988176a3f85b0586ecb8d672b74050760)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Sun Jul 8 01:28:42 2007 -0700

    GeForce 8600M GT.

diff --git a/src/nv_driver.c b/src/nv_driver.c
index f0f119f..28c46d1 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -344,6 +344,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE019E, "Quadro FX 4600" },
   { 0x10DE0400, "GeForce 8600 GTS" },
   { 0x10DE0402, "GeForce 8600 GT" },
+  { 0x10DE0407, "GeForce 8600M GT" },
   { 0x10DE0421, "GeForce 8500 GT" },
   { 0x10DE0422, "GeForce 8400 GS" },
   { 0x10DE0423, "GeForce 8300 GS" },
diff-tree 42dffde988176a3f85b0586ecb8d672b74050760 (from bc439899f323410b0549068cd88348e7fb62866b)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Sun Jul 8 00:53:00 2007 -0700

    Work around more MacBook wackiness.
    
    Turn off more corrupt the framebuffer mode.  Don't mess with the pixel clock for
    LVDS as long as we're trusting the VBIOS-programmed timings.

diff --git a/src/g80_driver.c b/src/g80_driver.c
index 0f97a2d..7801602 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -829,6 +829,7 @@ G80ScreenInit(int scrnIndex, ScreenPtr p
     AvailFBArea.y2 = pNv->offscreenHeight;
     xf86InitFBManager(pScreen, &AvailFBArea);
 
+    pNv->reg[0x00001708/4] = 0;
     for(i = 0; i < 8; i++)
         pNv->reg[0x00001900/4 + i] = 0;
 
diff --git a/src/g80_output.c b/src/g80_output.c
index 11bdb25..448864f 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -158,7 +158,8 @@ void
 G80OutputSetPClk(xf86OutputPtr output, int pclk)
 {
     G80OutputPrivPtr pPriv = output->driver_private;
-    pPriv->set_pclk(output, pclk);
+    if(pPriv->set_pclk)
+        pPriv->set_pclk(output, pclk);
 }
 
 int
diff --git a/src/g80_sor.c b/src/g80_sor.c
index 2ab9f2e..5ff7318 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -38,7 +38,7 @@ G80SorSetPClk(xf86OutputPtr output, int 
     G80Ptr pNv = G80PTR(output->scrn);
     G80OutputPrivPtr pPriv = output->driver_private;
     const int orOff = 0x800 * pPriv->or;
-    const int limit = pPriv->panelType == LVDS ? 112000 : 165000;
+    const int limit = 165000;
 
     pNv->reg[(0x00614300+orOff)/4] = (pclk > limit) ? 0x101 : 0;
 }
@@ -284,7 +284,8 @@ G80CreateSor(ScrnInfoPtr pScrn, ORNum or
     pPriv->or = or;
     pPriv->panelType = panelType;
     pPriv->cached_status = XF86OutputStatusUnknown;
-    pPriv->set_pclk = G80SorSetPClk;
+    if(panelType == TMDS)
+        pPriv->set_pclk = G80SorSetPClk;
     output->driver_private = pPriv;
     output->interlaceAllowed = TRUE;
     output->doubleScanAllowed = TRUE;