xserver-xorg-video-nv: Changes to 'debian-unstable'
ChangeLog | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
aclocal.m4 | 2 -
configure | 24 +++++++++---------
configure.ac | 2 -
debian/changelog | 6 ++++
src/g80_driver.c | 30 ++++++++++++++++++-----
src/nv_driver.c | 1
7 files changed, 115 insertions(+), 20 deletions(-)
New commits:
commit 49efe8926529617c2f3b3bfa3bc3ccc257d57532
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 2 22:38:13 2007 +0200
New upstream release 2.1.1
diff --git a/ChangeLog b/ChangeLog
index ead5a39..e8abf32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+commit 0f93ad0e2af26b4e2381f337b58d3a5e50302664
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Jul 2 09:01:12 2007 -0700
+
+ Bump to 2.1.1.
+
+commit 4ff01787a6640bf76cc34a51c99227845dc4678e
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Sat Jun 30 21:52:08 2007 -0700
+
+ GeForce 8400M G.
+
+commit 63eb1a4aa402ac3bf117634c3c9270261c6a4258
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Sat Jun 30 21:51:15 2007 -0700
+
+ Support configs with BAR1 < total RAM < 256 MB.
+
+commit 209c84e788faf3c4d0ce053e5f29ff5f5b798628
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Jun 18 13:08:31 2007 -0700
+
+ Bump to 2.1.0.
+
+commit 24770ccf880f056bc0db9464249caca10692fb56
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Jun 18 12:36:29 2007 -0700
+
+ Fix some random colormap corruption on DFPs with certain pre-G80 GPUs.
+
+commit 4e56465a79587c4df6bf1dfd7cc87a4f22707a8f
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Jun 7 18:28:56 2007 -0700
+
+ G80: Mode validation.
+
+ Disable LVDS modes larger than the native resolution.
+ Disable dual-link TMDS modes for now since they don't work reliably.
+
+commit 6b71721439802bffd715602af3036083ff442449
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Jun 4 23:15:42 2007 -0700
+
+ G80: LVDS support.
+
+commit 70b304cd0df0af515ce8414559f28a7ca7825517
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Jun 4 22:38:14 2007 -0700
+
+ G80: Rearrange HW video timing computations.
+
+ Compute the HW parameters in G80CrtcModeFixup and stash them in adjusted_mode.
+ Move some register writes into G80CreateSor.
+
+commit 402b1d1526f0dacd2e3a2564cc89958c32d3100e
+Merge: 1f4790a... 9b8470e...
+Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Sun Jun 3 11:18:50 2007 +1000
+
+ Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/driver/xf86-video-nv
+
+commit 1f4790adcafd402c84a4a761c870a26a5178a4ff
+Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Sun Jun 3 11:16:55 2007 +1000
+
+ Fix build. Including xf86DDC.h before we include xf86.h doesn't fly
+ and it's not necessary anyway as it's pulled in by g80_type.h
+
+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
commit 9b8470e9c81e6ce2c8cd69942fb2ffd2d4c06102
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed May 16 14:45:36 2007 -0700
diff --git a/aclocal.m4 b/aclocal.m4
index aaae5ad..f8a69fa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6528,7 +6528,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/configure b/configure
index d409d13..9fd4f35 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.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.1.1.
#
# 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.0'
-PACKAGE_STRING='xf86-video-nv 2.1.0'
+PACKAGE_VERSION='2.1.1'
+PACKAGE_STRING='xf86-video-nv 2.1.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1417,7 +1417,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.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1487,7 +1487,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nv 2.1.0:";;
+ short | recursive ) echo "Configuration of xf86-video-nv 2.1.1:";;
esac
cat <<\_ACEOF
@@ -1601,7 +1601,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-nv configure 2.1.0
+xf86-video-nv configure 2.1.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1615,7 +1615,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.0, which was
+It was created by xf86-video-nv $as_me 2.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2290,7 +2290,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-nv'
- VERSION='2.1.0'
+ VERSION='2.1.1'
cat >>confdefs.h <<_ACEOF
@@ -20423,7 +20423,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -20433,7 +20433,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -21292,7 +21292,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.0, which was
+This file was extended by xf86-video-nv $as_me 2.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21345,7 +21345,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-nv config.status 2.1.0
+xf86-video-nv config.status 2.1.1
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 f8c50a6..8ae5e54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 02 Jul 2007 22:34:40 +0200
+
xserver-xorg-video-nv (1:2.1.0-1) unstable; urgency=low
[ Brice Goglin ]
commit 0f93ad0e2af26b4e2381f337b58d3a5e50302664
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jul 2 09:01:12 2007 -0700
Bump to 2.1.1.
diff --git a/configure.ac b/configure.ac
index 0b5c14b..ec55eb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nv],
- 2.1.0,
+ 2.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nv)
commit 4ff01787a6640bf76cc34a51c99227845dc4678e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sat Jun 30 21:52:08 2007 -0700
GeForce 8400M G.
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 4c2a395..f0f119f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -347,6 +347,7 @@ static SymTabRec NVKnownChipsets[] =
{ 0x10DE0421, "GeForce 8500 GT" },
{ 0x10DE0422, "GeForce 8400 GS" },
{ 0x10DE0423, "GeForce 8300 GS" },
+ { 0x10DE0428, "GeForce 8400M G" },
{-1, NULL}
};
commit 63eb1a4aa402ac3bf117634c3c9270261c6a4258
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sat Jun 30 21:51:15 2007 -0700
Support configs with BAR1 < total RAM < 256 MB.
diff --git a/src/g80_driver.c b/src/g80_driver.c
index c81388c..e703ea8 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -194,6 +194,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
const Gamma gzeros = {0.0, 0.0, 0.0};
char *s;
CARD32 tmp;
+ memType BAR1sizeKB;
if(flags & PROBE_DETECT) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -341,18 +342,35 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
pNv->architecture = pNv->reg[0] >> 20 & 0x1ff;
pNv->RamAmountKBytes = pNv->RamAmountKBytes = (pNv->reg[0x0010020C/4] & 0xFFF00000) >> 10;
pNv->videoRam = pNv->RamAmountKBytes;
- /* Limit videoRam to the max BAR1 size of 256MB */
- if(pNv->videoRam <= 1024) {
+
+ /* Determine the size of BAR1 */
+ /* Some configs have BAR1 < total RAM < 256 MB */
+ BAR1sizeKB = 1UL << (pPci->size[1] - 10);
+ if(BAR1sizeKB > 256 * 1024) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "BAR1 is > 256 MB, which is "
+ "probably wrong. Clamping to 256 MB.\n");
+ BAR1sizeKB = 256 * 1024;
+ }
+
+ /* Limit videoRam to the size of BAR1 */
+ if(pNv->videoRam <= 1024 || BAR1sizeKB == 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to determine the amount of "
"available video memory\n");
goto fail;
}
pNv->videoRam -= 1024;
- if(pNv->videoRam > 256 * 1024)
- pNv->videoRam = 256 * 1024;
+ if(pNv->videoRam > BAR1sizeKB)
+ pNv->videoRam = BAR1sizeKB;
+
pScrn->videoRam = pNv->videoRam;
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Mapping %.1f of %.1f MB of video RAM\n",
- pScrn->videoRam / 1024.0, pNv->RamAmountKBytes / 1024.0);
+
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Total video RAM: %.1f MB\n",
+ pNv->RamAmountKBytes / 1024.0);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " BAR1 size: %.1f MB\n",
+ BAR1sizeKB / 1024.0);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, " Mapped memory: %.1f MB\n",
+ pScrn->videoRam / 1024.0);
+
pNv->mem = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,
pcitag, pPci->memBase[1], pScrn->videoRam * 1024);
Reply to: