xserver-xorg-video-nv: Changes to 'debian-experimental'
.gitignore | 1
ChangeLog | 268 ++++++++++
Makefile.in | 51 +
aclocal.m4 | 265 ++++++----
compat/Makefile.am | 1
compat/Makefile.in | 9
config.guess | 36 -
config.sub | 52 +-
configure | 960 +++++++++++++++++++++++++++++--------
configure.ac | 14
debian/changelog | 85 +++
debian/control | 8
debian/copyright | 52 +-
debian/patches/01_gen_pci_ids.diff | 8
debian/rules | 6
debian/xsfbs/xsfbs-autoreconf.mk | 150 -----
debian/xsfbs/xsfbs.mk | 102 ---
debian/xsfbs/xsfbs.sh | 394 ++++++++-------
depcomp | 33 -
install-sh | 228 ++++----
ltmain.sh | 58 +-
man/Makefile.am | 1
man/Makefile.in | 9
man/nv.man | 25
src/Makefile.am | 3
src/Makefile.in | 47 +
src/g80_dac.c | 19
src/g80_display.c | 20
src/g80_driver.c | 75 ++
src/g80_output.c | 204 ++++++-
src/g80_sor.c | 82 ++-
src/g80_type.h | 15
src/nv_const.h | 17
src/nv_cursor.c | 66 --
src/nv_dac.c | 60 --
src/nv_dma.h | 61 --
src/nv_driver.c | 286 ++++++++---
src/nv_hw.c | 86 +--
src/nv_local.h | 60 --
src/nv_setup.c | 97 ++-
src/nv_type.h | 4
src/nv_xaa.c | 60 --
src/nvreg.h | 195 -------
src/nvvga.h | 80 ---
src/riva_cursor.c | 4
src/riva_driver.c | 49 +
src/riva_hw.c | 60 --
src/riva_hw.h | 61 --
src/riva_local.h | 60 --
src/riva_setup.c | 56 +-
src/riva_tbl.h | 60 --
src/riva_type.h | 4
src/riva_xaa.c | 60 --
53 files changed, 2858 insertions(+), 1909 deletions(-)
New commits:
commit e50c514b86c950d1eed966298a83506ecb8847db
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 14 01:46:43 2008 +0200
Build against xserver 1.5 rc5.
diff --git a/debian/changelog b/debian/changelog
index b2995d6..3d8e45b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.10-3) experimental; urgency=low
+
+ * Build against xserver 1.5 rc5.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 14 Jul 2008 01:49:15 +0200
+
xserver-xorg-video-nv (1:2.1.10-2) UNRELEASED; urgency=low
[ Chris Lamb ]
diff --git a/debian/control b/debian/control
index 041f68e..a77276a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, dpkg-dev (>= 1.14.17)
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4.99.905), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
commit a82d5d421e4faaefd135f45cd4cc6ef646b883aa
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 12:41:23 2008 +0200
Install README.G80 in the package.
diff --git a/debian/changelog b/debian/changelog
index 6b02778..b2995d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-xserver-xorg-video-nv (1:2.1.10-2) unstable; urgency=low
+xserver-xorg-video-nv (1:2.1.10-2) UNRELEASED; urgency=low
+ [ Chris Lamb ]
* Update copyright holders in debian/copyright.
+ [ Julien Cristau ]
+ * Install README.G80 in the package.
+
-- Chris Lamb <chris@chris-lamb.co.uk> Thu, 03 Jul 2008 02:30:36 +0100
xserver-xorg-video-nv (1:2.1.10-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 6da318f..66d4edf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ binary-arch: build install serverabi
dh_testdir
dh_testroot
- dh_installdocs
+ dh_installdocs README.G80
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
dh_link
commit 31b9ad1e2724cb756dd515da49ed2f189f7972fe
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Thu Jul 3 02:31:02 2008 +0100
Update copyright holders in debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 8ea9974..6b02778 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.10-2) unstable; urgency=low
+
+ * Update copyright holders in debian/copyright.
+
+ -- Chris Lamb <chris@chris-lamb.co.uk> Thu, 03 Jul 2008 02:30:36 +0100
+
xserver-xorg-video-nv (1:2.1.10-1) unstable; urgency=low
* New upstream release, closes: #484875.
diff --git a/debian/copyright b/debian/copyright
index 86b6bf3..4f59f86 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,41 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/driver/
-Copyright (c) 2007 NVIDIA, Corporation
+ Copyright (C) 1993-2007 NVIDIA, Corporation
+ Copyright (C) 1994 X Consortium
+ Copyright (C) 1994, 1995, 1996 Video Electronics Standards
+ Copyright (C) 1996-1997 David J. McKay
+ Copyright (C) 1996 Stephen Early
+ Copyright (C) 1997 Mark Eichin
+ Copyright (C) 1997 Metro Link Incorporated
+ Copyright (C) 1998-2005, 2007 Branden Robinson
+ Copyright (C) 1999 The XFree86 Project Inc.
+ Copyright (C) 2001 Andy Ritger
+ Copyright (C) 2005 Adam Jackson
+ Copyright (C) 2005 David Nusinow
+ Copyright (C) 2005 Eugene Konev
+ Copyright (C) 2005 Sun Microsystems, Inc.
+ Copyright (C) 2005-2006 Luc Verhaegen.
+ Copyright (C) 2006 Keith Packard
+ Copyright (C) 2006 Intel Corporation
+ Copyright (C) 2006 Luc Verhaegen
+ Copyright (C) 2008 Red Hat, Inc.
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
commit 87d6d4bf1ca91b0c71d3d148a673f75be4685e2a
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 1 07:18:09 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index a57f851..8ea9974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nv (1:2.1.10-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.10-1) unstable; urgency=low
* New upstream release, closes: #484875.
* Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
@@ -6,7 +6,7 @@ xserver-xorg-video-nv (1:2.1.10-1) UNRELEASED; urgency=low
dpkg-shlibdeps to shut up about symbols it can't find.
+ Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings.
- -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 07:12:56 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 07:18:05 +0200
xserver-xorg-video-nv (1:2.1.9-1) unstable; urgency=low
commit ba06480955235ed31f7481ea6fc993fc050c88db
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 1 07:13:26 2008 +0200
Run dpkg-shlibdeps with --warnings=6
Drivers reference symbols from /usr/bin/Xorg and other modules, and
that's not a bug, so we want dpkg-shlibdeps to shut up about symbols it
can't find.
Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings.
diff --git a/debian/changelog b/debian/changelog
index 39c4c24..a57f851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-nv (1:2.1.10-1) UNRELEASED; urgency=low
* New upstream release, closes: #484875.
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find.
+ + Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings.
- -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 06:58:56 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 07:12:56 +0200
xserver-xorg-video-nv (1:2.1.9-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 96e8cbe..041f68e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
diff --git a/debian/rules b/debian/rules
index 83828c4..6da318f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb
commit 5db7f93ee1a226396c960b6e5a603a6a83dbfcba
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 1 07:01:26 2008 +0200
New upstream release
diff --git a/configure b/configure
index 93d3080..e649f76 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.9.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.10.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-nv'
PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.1.9'
-PACKAGE_STRING='xf86-video-nv 2.1.9'
+PACKAGE_VERSION='2.1.10'
+PACKAGE_STRING='xf86-video-nv 2.1.10'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1425,7 +1425,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.1.9 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1495,7 +1495,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.1.9:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.10:";;
esac
cat <<\_ACEOF
@@ -1613,7 +1613,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-nv configure 2.1.9
+xf86-video-nv configure 2.1.10
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1627,7 +1627,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-nv $as_me 2.1.9, which was
+It was created by xf86-video-nv $as_me 2.1.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2322,7 +2322,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-nv'
- VERSION='2.1.9'
+ VERSION='2.1.10'
cat >>confdefs.h <<_ACEOF
@@ -22128,7 +22128,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-nv $as_me 2.1.9, which was
+This file was extended by xf86-video-nv $as_me 2.1.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22181,7 +22181,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-nv config.status 2.1.9
+xf86-video-nv config.status 2.1.10
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 6fde2fc..39c4c24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.10-1) UNRELEASED; urgency=low
+
+ * New upstream release, closes: #484875.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 01 Jul 2008 06:58:56 +0200
+
xserver-xorg-video-nv (1:2.1.9-1) unstable; urgency=low
* New upstream release.
commit 6cd80057fadbb8d63d3e1a623515206800fefc8e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 30 16:26:09 2008 -0700
Bump to 2.1.10.
diff --git a/configure.ac b/configure.ac
index d20a2f1..6514aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nv],
- 2.1.9,
+ 2.1.10,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nv)
commit 3f43093cf0c0338a1a479ed4ba2fad3f5f04ad69
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 30 16:25:54 2008 -0700
More G8x chips.
diff --git a/src/nv_driver.c b/src/nv_driver.c
index d710d06..b6c7209 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -785,6 +785,7 @@ NVIsG80(int chipType)
case 0x0630:
case 0x0640:
case 0x06e0:
+ case 0x06f0:
return TRUE;
}
commit 69aa963d7ab8256d0e932e1a5a98599f168b8836
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 30 13:30:07 2008 -0700
Fix build by using CARD32 instead of uint32_t, like we do everywhere else.
diff --git a/src/g80_output.c b/src/g80_output.c
index e28b584..4c8448f 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -211,9 +211,9 @@ fail:
return FALSE;
}
-static uint32_t i2cAddr(const int port)
+static CARD32 i2cAddr(const int port)
{
- const uint32_t base = (port > 3) ? 0x0000E1E0 : 0x0000E138;
+ const CARD32 base = (port > 3) ? 0x0000E1E0 : 0x0000E138;
return base + port * 0x18;
}
@@ -297,7 +297,7 @@ ProbeDDC(I2CBusPtr i2c)
G80Ptr pNv = G80PTR(pScrn);
xf86MonPtr monInfo = NULL;
const int bus = i2c->DriverPrivate.val;
- const uint32_t addr = i2cAddr(bus);
+ const CARD32 addr = i2cAddr(bus);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Probing for EDID on I2C bus %i...\n", bus);
commit 91d8778176f1db54c8222a95315610a043198648
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Jun 29 21:26:57 2008 -0700
G80: Handle extended I2C ports and LVDS panels with DDC-based EDIDs.
diff --git a/src/g80_output.c b/src/g80_output.c
index 1cf4669..e28b584 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 NVIDIA, Corporation
+ * Copyright (c) 2007-2008 NVIDIA, Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
@@ -76,7 +76,7 @@ static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
CARD32 b;
/* Clear the i2c map to invalid */
- for(i = 0; i < 4; i++)
+ for(i = 0; i < G80_NUM_I2C_PORTS; i++)
pNv->i2cMap[i].dac = pNv->i2cMap[i].sor = -1;
if(*(CARD16*)pNv->table1 != 0xaa55) goto fail;
@@ -162,6 +162,27 @@ static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
case 3: /* LVDS */
pNv->lvds.present = TRUE;
pNv->lvds.or = or;
+ pNv->lvds.i2cPort = -1;
+
+ if(port == 15) {
+ xf86DrvMsg(scrnIndex, X_INFO, "LVDS has no I2C port\n");
+ break;
+ }
+ if(port >= table3Entries) {
+ xf86DrvMsg(scrnIndex, X_WARNING,
+ "LVDS: invalid port %d\n", port);
+ break;
+ }
+ b = *(CARD32*)&table3[table3EntSize * port];
+ port = b & 0xff;
+ portType = b >> 24;
+ if(portType != 5) {
+ xf86DrvMsg(scrnIndex, X_WARNING,
+ "LVDS: invalid port type %d\n", portType);
+ break;
+ }
+ pNv->lvds.i2cPort = port;
+
break;
default:
@@ -172,7 +193,7 @@ 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);
- for(i = 0; i < 4; i++) {
+ 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);
if(pNv->i2cMap[i].sor != -1)
@@ -190,21 +211,24 @@ fail:
return FALSE;
}
+static uint32_t i2cAddr(const int port)
+{
+ const uint32_t base = (port > 3) ? 0x0000E1E0 : 0x0000E138;
+ return base + port * 0x18;
+}
+
static void G80_I2CPutBits(I2CBusPtr b, int clock, int data)
{
G80Ptr pNv = G80PTR(xf86Screens[b->scrnIndex]);
- const int off = b->DriverPrivate.val * 0x18;
-
- pNv->reg[(0x0000E138+off)/4] = 4 | clock | data << 1;
+ pNv->reg[i2cAddr(b->DriverPrivate.val)/4] = 4 | clock | data << 1;
}
static void G80_I2CGetBits(I2CBusPtr b, int *clock, int *data)
{
G80Ptr pNv = G80PTR(xf86Screens[b->scrnIndex]);
- const int off = b->DriverPrivate.val * 0x18;
unsigned char val;
- val = pNv->reg[(0x0000E138+off)/4];
+ val = pNv->reg[i2cAddr(b->DriverPrivate.val)/4];
*clock = !!(val & 1);
*data = !!(val & 2);
}
@@ -272,14 +296,15 @@ ProbeDDC(I2CBusPtr i2c)
ScrnInfoPtr pScrn = xf86Screens[i2c->scrnIndex];
G80Ptr pNv = G80PTR(pScrn);
xf86MonPtr monInfo = NULL;
- const int bus = i2c->DriverPrivate.val, off = bus * 0x18;
+ const int bus = i2c->DriverPrivate.val;
+ const uint32_t addr = i2cAddr(bus);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Probing for EDID on I2C bus %i...\n", bus);
- pNv->reg[(0x0000E138+off)/4] = 7;
+ pNv->reg[addr/4] = 7;
/* Should probably use xf86OutputGetEDID here */
monInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, i2c);
- pNv->reg[(0x0000E138+off)/4] = 3;
+ pNv->reg[addr/4] = 3;
if(monInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
@@ -376,7 +401,7 @@ G80CreateOutputs(ScrnInfoPtr pScrn)
return FALSE;
/* For each DDC port, create an output for the attached ORs */
- for(i = 0; i < 4; i++) {
+ for(i = 0; i < G80_NUM_I2C_PORTS; i++) {
xf86OutputPtr dac = NULL, sor = NULL;
I2CBusPtr i2c;
char i2cName[16];
@@ -420,6 +445,19 @@ G80CreateOutputs(ScrnInfoPtr pScrn)
G80OutputPrivPtr pPriv = lvds->driver_private;
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);
+ pPriv->i2c = G80I2CInit(pScrn, i2cName, pNv->lvds.i2cPort);
+ if(!pPriv->i2c) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to initialize I2C for port %i (LVDS)!\n",
+ pNv->lvds.i2cPort);
+ }
+ }
}
/* For each output, set the crtc and clone masks */
diff --git a/src/g80_sor.c b/src/g80_sor.c
index 202e838..c1ef42d 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 NVIDIA, Corporation
+ * Copyright (c) 2007-2008 NVIDIA, Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
@@ -143,7 +143,15 @@ G80SorDetect(xf86OutputPtr output)
static xf86OutputStatus
G80SorLVDSDetect(xf86OutputPtr output)
{
- /* Assume LVDS is always connected */
+ G80OutputPrivPtr pPriv = output->driver_private;
+
+ if(pPriv->i2c) {
+ /* If LVDS has an I2C port, use the normal probe routine to get the
+ * EDID, if possible. */
+ G80SorDetect(output);
+ }
+
+ /* Ignore G80SorDetect and assume LVDS is always connected */
return XF86OutputStatusConnected;
}
@@ -242,6 +250,13 @@ static DisplayModePtr
G80SorGetLVDSModes(xf86OutputPtr output)
{
G80OutputPrivPtr pPriv = output->driver_private;
+
+ /* If an EDID was read during detection, use the modes from that. */
+ DisplayModePtr modes = G80OutputGetDDCModes(output);
+ if(modes)
+ return modes;
+
+ /* Otherwise, feed in the mode we read during initialization. */
return xf86DuplicateMode(pPriv->nativeMode);
}
diff --git a/src/g80_type.h b/src/g80_type.h
index 30ef3fe..0cebae7 100644
--- a/src/g80_type.h
+++ b/src/g80_type.h
@@ -7,6 +7,8 @@
#include <xf86Crtc.h>
#include <xf86int10.h>
+#define G80_NUM_I2C_PORTS 6
+
typedef enum Head {
HEAD0 = 0,
HEAD1
@@ -51,10 +53,11 @@ typedef struct G80Rec {
struct {
ORNum dac;
ORNum sor;
- } i2cMap[4];
+ } i2cMap[G80_NUM_I2C_PORTS];
struct {
Bool present;
ORNum or;
+ int i2cPort;
} lvds;
unsigned loadVal;
commit db768cf105956fbea39383a2214227782bf827b0
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Jun 22 13:01:21 2008 -0700
Add a note that MODE_PANEL really means "larger than BIOS-programmed panel size".
Bug #16085.
diff --git a/src/nv_setup.c b/src/nv_setup.c
index 606696d..b057da1 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -698,6 +698,10 @@ NVCommonSetup(ScrnInfoPtr pScrn)
pNv->fpSyncs = pNv->PRAMDAC[0x0848/4] & 0x30000033;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Panel size is %i x %i\n",
pNv->fpWidth, pNv->fpHeight);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NOTE: This driver cannot "
+ "reconfigure the BIOS-programmed size.\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "These dimensions will be used as "
+ "the panel size for mode validation.\n");
}
if(monitorA)
commit fb10793d2607d30077a9861b575c108b6c4101ca
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Jun 22 12:55:10 2008 -0700
Add new chips to the man page and fix capitalization of "Quadro".
diff --git a/man/nv.man b/man/nv.man
index ee0d45b..2d559e6 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -35,22 +35,22 @@ NV4
.B RIVA TNT2
NV5
.TP 22
-.B GeForce 256, QUADRO
+.B GeForce 256, Quadro
NV10
.TP 22
-.B GeForce2, QUADRO2
+.B GeForce2, Quadro2
NV11 & NV15
.TP 22
-.B GeForce3, QUADRO DCC
+.B GeForce3, Quadro DCC
NV20
.TP 22
.B nForce, nForce2
NV1A, NV1F
.TP 22
-.B GeForce4, QUADRO4
+.B GeForce4, Quadro4
NV17, NV18, NV25, NV28
.TP 22
-.B GeForce FX, QUADRO FX
+.B GeForce FX, Quadro FX
NV30, NV31, NV34, NV35, NV36, NV37, NV38
.TP 22
.B GeForce 6XXX
@@ -59,9 +59,12 @@ NV40, NV41, NV43, NV44, NV45, C51
.B GeForce 7XXX
G70, G71, G72, G73
.TP 22
-.B GeForce 8XXX
-G80, G84, G86, G92
-
+.B GeForce 8XXX, GeForce 9XXX
+G80, G84, G86, G92, G94, G96, G98
+.TP 22
+.B GeForce GTX
+GT200
+.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
commit 2fdcda8ea62eba1b7885f0a75249884715936247
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Jun 22 12:45:31 2008 -0700
Replace copyright notices with stock MIT X11 boilerplate.
diff --git a/man/nv.man b/man/nv.man
index 19816bd..ee0d45b 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -194,7 +194,7 @@ Authors include: David McKay, Jarno Paananen, Chas Inman, Dave Schmenk,
Mark Vojkovich, Aaron Plattner
.SH COPYRIGHT
.LP
-Copyright (c) 2003 - 2007 NVIDIA, Corporation
+Copyright (c) 2003 - 2008 NVIDIA, Corporation
.LP
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
diff --git a/src/nv_cursor.c b/src/nv_cursor.c
index 73e3fc6..bf5adc0 100644
--- a/src/nv_cursor.c
+++ b/src/nv_cursor.c
@@ -1,41 +1,25 @@
- /***************************************************************************\
-|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NOTICE TO USER: The source code is copyrighted under U.S. and *|
-|* international laws. Users and possessors of this source code are *|
-|* hereby granted a nonexclusive, royalty-free copyright license to *|
-|* use this code in individual and commercial software. *|
-|* *|
-|* Any use of this source code must include, in the user documenta- *|
-|* tion and internal comments to the code, notices to the end user *|
-|* as follows: *|
-|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *|
-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *|
-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *|
-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *|
-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *|
-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *|
-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *|
-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *|
-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *|
-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *|
-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *|
-|* *|
-|* U.S. Government End Users. This source code is a "commercial *|
-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *|
-|* consisting of "commercial computer software" and "commercial *|
-|* computer software documentation," as such terms are used in *|
-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *|
-|* ment only as a commercial end item. Consistent with 48 C.F.R. *|
-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *|
-|* all U.S. Government End Users acquire the source code with only *|
-|* those rights set forth herein. *|
-|* *|
- \***************************************************************************/
+/*
+ * Copyright (c) 2003 NVIDIA, Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/nv_dac.c b/src/nv_dac.c
index ec7739b..b1049cc 100644
--- a/src/nv_dac.c
+++ b/src/nv_dac.c
@@ -1,41 +1,25 @@
- /***************************************************************************\
-|* *|
-|* Copyright 2007 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NOTICE TO USER: The source code is copyrighted under U.S. and *|
-|* international laws. Users and possessors of this source code are *|
-|* hereby granted a nonexclusive, royalty-free copyright license to *|
-|* use this code in individual and commercial software. *|
-|* *|
-|* Any use of this source code must include, in the user documenta- *|
-|* tion and internal comments to the code, notices to the end user *|
-|* as follows: *|
-|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *|
-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *|
-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *|
-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *|
-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *|
-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *|
-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *|
-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *|
-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *|
-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *|
-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *|
-|* *|
-|* U.S. Government End Users. This source code is a "commercial *|
-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *|
-|* consisting of "commercial computer software" and "commercial *|
-|* computer software documentation," as such terms are used in *|
-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *|
-|* ment only as a commercial end item. Consistent with 48 C.F.R. *|
-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *|
-|* all U.S. Government End Users acquire the source code with only *|
-|* those rights set forth herein. *|
-|* *|
- \***************************************************************************/
+/*
+ * Copyright (c) 2007 NVIDIA, Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/nv_dma.h b/src/nv_dma.h
index 150918a..fbd72e1 100644
--- a/src/nv_dma.h
+++ b/src/nv_dma.h
@@ -1,42 +1,25 @@
-
- /***************************************************************************\
-|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NOTICE TO USER: The source code is copyrighted under U.S. and *|
-|* international laws. Users and possessors of this source code are *|
-|* hereby granted a nonexclusive, royalty-free copyright license to *|
-|* use this code in individual and commercial software. *|
-|* *|
-|* Any use of this source code must include, in the user documenta- *|
-|* tion and internal comments to the code, notices to the end user *|
-|* as follows: *|
-|* *|
-|* Copyright 2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *|
-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *|
-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *|
-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *|
-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *|
-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *|
-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *|
-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *|
-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *|
-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *|
-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *|
-|* *|
-|* U.S. Government End Users. This source code is a "commercial *|
-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *|
-|* consisting of "commercial computer software" and "commercial *|
-|* computer software documentation," as such terms are used in *|
-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *|
-|* ment only as a commercial end item. Consistent with 48 C.F.R. *|
-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *|
-|* all U.S. Government End Users acquire the source code with only *|
-|* those rights set forth herein. *|
-|* *|
- \***************************************************************************/
+/*
+ * Copyright (c) 2003 NVIDIA, Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
#define SURFACE_FORMAT 0x00000300
#define SURFACE_FORMAT_DEPTH8 0x00000001
diff --git a/src/nv_hw.c b/src/nv_hw.c
index 0e74e4d..ecac28f 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -1,41 +1,25 @@
- /***************************************************************************\
-|* *|
-|* Copyright 1993-2003 NVIDIA, Corporation. All rights reserved. *|
-|* *|
-|* NOTICE TO USER: The source code is copyrighted under U.S. and *|
-|* international laws. Users and possessors of this source code are *|
-|* hereby granted a nonexclusive, royalty-free copyright license to *|
-|* use this code in individual and commercial software. *|
-|* *|
-|* Any use of this source code must include, in the user documenta- *|
Reply to: