xf86-video-nv: 3 commits - src/g80_display.c src/g80_output.c src/g80_xaa.c

[Aaron Plattner]

 src/g80_display.c |    5 ++---
 src/g80_output.c  |    9 ++++++---
 src/g80_xaa.c     |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 7884f5918715a8df35cd0d7601cb50c7c5b56e70
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Sun Aug 24 00:23:54 2008 -0700

    Bug #15309: Set the pixel clock even if the hardware doesn't think it needs it.
    
    Fixes a problem where switching from DVI to VGA hangs.

diff --git a/src/g80_display.c b/src/g80_display.c
index 8b97b8a..cf4631d 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -191,15 +191,14 @@ G80DispCommand(ScrnInfoPtr pScrn, CARD32 addr, CARD32 data)
         if(super) {
             if(super == 2) {
                 xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-                const CARD32 r = pNv->reg[0x00610030/4];
                 int i;
 
                 for(i = 0; i < xf86_config->num_crtc; i++)
                 {
                     xf86CrtcPtr crtc = xf86_config->crtc[i];
-                    G80CrtcPrivPtr pPriv = crtc->driver_private;
+                    const int headOff = 0x800 * G80CrtcGetHead(crtc);
 
-                    if(r & (0x200 << pPriv->head))
+                    if((pNv->reg[(0x00614200+headOff)/4] & 0xc0) == 0x80)
                         G80CrtcSetPClk(crtc);
                 }
             }
commit ff32eb25f8edde7343da3d4782f0f59896515ebd
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Sat Aug 23 10:41:00 2008 -0700

    Fix warnings.

diff --git a/src/g80_output.c b/src/g80_output.c
index 140f3c8..e906fbb 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -451,7 +451,6 @@ G80CreateOutputs(ScrnInfoPtr pScrn)
         pPriv->scale = G80_SCALE_ASPECT;
 
         if(pNv->lvds.i2cPort != -1) {
-            I2CBusPtr i2c;
             char i2cName[16];
 
             snprintf(i2cName, sizeof(i2cName), "I2C%i (LVDS)", pNv->lvds.i2cPort);
diff --git a/src/g80_xaa.c b/src/g80_xaa.c
index bcacbb4..0a3c1b3 100644
--- a/src/g80_xaa.c
+++ b/src/g80_xaa.c
@@ -95,7 +95,7 @@ G80SetRopSolid(G80Ptr pNv, CARD32 rop, CARD32 planemask)
     }
 }
 
-void inline
+inline void
 G80SetClip(G80Ptr pNv, int x, int y, int w, int h)
 {
     G80DmaStart(pNv, 0x280, 4);
commit c2128e5a8682e407b37f88c67a1709309247fc5d
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Sat Aug 23 10:36:37 2008 -0700

    G80: Log the i2c port number for LVDS, when there is one.

diff --git a/src/g80_output.c b/src/g80_output.c
index 4c8448f..140f3c8 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -191,8 +191,12 @@ static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
     }
 
     xf86DrvMsg(scrnIndex, X_PROBED, "Connector map:\n");
-    if(pNv->lvds.present)
-        xf86DrvMsg(scrnIndex, X_PROBED, "  [N/A] -> SOR%i (LVDS)\n", pNv->lvds.or);
+    if(pNv->lvds.present) {
+        if (pNv->lvds.i2cPort != -1)
+            xf86DrvMsg(scrnIndex, X_PROBED, "  Bus %i -> SOR%i (LVDS)\n", pNv->lvds.i2cPort, pNv->lvds.or);
+        else
+            xf86DrvMsg(scrnIndex, X_PROBED, "  [N/A] -> SOR%i (LVDS)\n", pNv->lvds.or);
+    }
     for(i = 0; i < G80_NUM_I2C_PORTS; i++) {
         if(pNv->i2cMap[i].dac != -1)
             xf86DrvMsg(scrnIndex, X_PROBED, "  Bus %i -> DAC%i\n", i, pNv->i2cMap[i].dac);