xf86-video-nv: 3 commits - configure.ac src/nv_driver.c src/nv_setup.c src/riva_driver.c

[Aaron Plattner]

 configure.ac      |   10 +---------
 src/nv_driver.c   |    2 +-
 src/nv_setup.c    |   10 +++++++---
 src/riva_driver.c |    2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

New commits:
diff-tree 558ef7e26e361529a05360610abc3cbcdb04fd67 (from 08bb966abbca11c4581d666af3249e4922156e03)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Nov 30 17:36:29 2006 -0800

    Save and restore DAC0 register 608 when probing for connected CRTs.
    
    Adapted from a patch by Egbert Eich for Novell bug #220197.

diff --git a/src/nv_setup.c b/src/nv_setup.c
index c7a0e86..4009fde 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -174,14 +174,17 @@ NVIsConnected (ScrnInfoPtr pScrn, int ou
 {
     NVPtr pNv = NVPTR(pScrn);
     volatile U032 *PRAMDAC = pNv->PRAMDAC0;
-    CARD32 reg52C, reg608;
+    CARD32 reg52C, reg608, dac0_reg608;
     Bool present;
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                "Probing for analog device on output %s...\n", 
                 output ? "B" : "A");
 
-    if(output) PRAMDAC += 0x800;
+    if(output) {
+        dac0_reg608 = PRAMDAC[0x0608/4];
+        PRAMDAC += 0x800;
+    }
 
     reg52C = PRAMDAC[0x052C/4];
     reg608 = PRAMDAC[0x0608/4];
@@ -204,7 +207,8 @@ NVIsConnected (ScrnInfoPtr pScrn, int ou
     else
        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  ...can't find one\n");
 
-    pNv->PRAMDAC0[0x0608/4] &= 0x0000EFFF;
+    if(output)
+        pNv->PRAMDAC0[0x0608/4] = dac0_reg608;
 
     PRAMDAC[0x052C/4] = reg52C;
     PRAMDAC[0x0608/4] = reg608;
diff-tree 08bb966abbca11c4581d666af3249e4922156e03 (from 162391f8fb640184db3917f3842fbff0bc9ce606)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Nov 30 17:14:38 2006 -0800

    Use XORG_RELEASE_VERSION.

diff --git a/configure.ac b/configure.ac
index 0a5754e..93ce107 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,15 +26,7 @@ AC_INIT([xf86-video-nv],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-nv)
 
-AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION],
-                   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]\+]\)\.[[0-9]\+]\.[[0-9]\+]/\1/')],
-                   [Major version])
-AC_DEFINE_UNQUOTED([NV_MINOR_VERSION],
-                   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]\+]\.\([[0-9]\+]\)\.[[0-9]\+]/\1/')],
-                   [Minor version])
-AC_DEFINE_UNQUOTED([NV_PATCHLEVEL],
-                   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]\+]\.[[0-9]\+]\.\([[0-9]\+]\)/\1/')],
-                   [Patch version])
+XORG_RELEASE_VERSION
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
diff --git a/src/nv_driver.c b/src/nv_driver.c
index cb759be..fc83770 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -458,7 +458,7 @@ static XF86ModuleVersionInfo nvVersRec =
     MODINFOSTRING1,
     MODINFOSTRING2,
     XORG_VERSION_CURRENT,
-    NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL,
+    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,                     /* This is a video driver */
     ABI_VIDEODRV_VERSION,
     MOD_CLASS_VIDEODRV,
diff --git a/src/riva_driver.c b/src/riva_driver.c
index e062995..f07a726 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -177,7 +177,7 @@ static XF86ModuleVersionInfo rivaVersRec
     MODINFOSTRING1,
     MODINFOSTRING2,
     XORG_VERSION_CURRENT,
-    NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL,
+    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,                     /* This is a video driver */
     ABI_VIDEODRV_VERSION,
     MOD_CLASS_VIDEODRV,
diff-tree 162391f8fb640184db3917f3842fbff0bc9ce606 (from 98372d0f94a9d658a7257d2199ef37a2449b9961)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Oct 26 19:08:29 2006 -0700

    Handle more than 1 digit in the version numbers.
    
    Based on a change by George Sapountzis <gsap7 at yahoo.gr>.

diff --git a/configure.ac b/configure.ac
index 2143573..0a5754e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,13 +27,13 @@ AC_INIT([xf86-video-nv],
         xf86-video-nv)
 
 AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION],
-                   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')],
+                   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]\+]\)\.[[0-9]\+]\.[[0-9]\+]/\1/')],
                    [Major version])
 AC_DEFINE_UNQUOTED([NV_MINOR_VERSION],
-                   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')],
+                   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]\+]\.\([[0-9]\+]\)\.[[0-9]\+]/\1/')],
                    [Minor version])
 AC_DEFINE_UNQUOTED([NV_PATCHLEVEL],
-                   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')],
+                   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]\+]\.[[0-9]\+]\.\([[0-9]\+]\)/\1/')],
                    [Patch version])
 
 AC_CONFIG_SRCDIR([Makefile.am])