xserver-xorg-video-nv: Changes to 'debian-unstable'
ChangeLog | 243
Makefile.am | 4
Makefile.in | 688 -
README | 20
README.NV1 | 42
aclocal.m4 | 8256 -----------------
compat/Makefile.in | 362
config.guess | 1526 ---
config.h.in | 69
config.sub | 1658 ---
configure |23140 -------------------------------------------------
configure.ac | 2
debian/changelog | 29
debian/control | 16
debian/rules | 27
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 29
debian/xsfbs/xsfbs.sh | 66
depcomp | 589 -
install-sh | 519 -
ltmain.sh | 6964 --------------
man/Makefile.in | 429
man/nv.man | 2
missing | 367
mkinstalldirs | 161
src/Makefile.in | 727 -
src/g80_display.c | 5
src/g80_driver.c | 21
src/g80_exa.c | 4
src/g80_output.c | 13
src/g80_xaa.c | 12
src/nv_dac.c | 95
src/nv_driver.c | 34
src/nv_hw.c | 12
src/nv_setup.c | 20
src/nv_type.h | 14
src/riva_dac.c | 78
src/riva_setup.c | 7
src/riva_type.h | 14
39 files changed, 567 insertions(+), 45729 deletions(-)
New commits:
commit 87eda80b744669ec9bfce6d31b136b724d873079
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 9 10:42:50 2009 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 0c48145..de1dfcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-nv (1:2.1.13-1) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low
* New upstream release.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Thu, 09 Apr 2009 10:41:22 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Apr 2009 10:42:43 +0100
xserver-xorg-video-nv (1:2.1.12-2) experimental; urgency=low
commit a77e76aa65b7d45bcdf2bbd5420a8f761bac5548
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 9 10:42:18 2009 +0100
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 93447eb..d91d56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,103 @@
+commit df87eaf191209b0f1619ea74dc9fb0314b6fd288
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Apr 7 13:40:36 2009 -0400
+
+ nv 2.1.13
+
+commit c0cc7d1247798867c695aeddcffe88edacbb6c7c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Apr 7 13:34:26 2009 -0400
+
+ Remove README.NV1
+
+ There's no nv1 support here, so.
+
+commit b278aca7d7b92b7fd62045d1aab44d78f694d608
+Author: Bryce Harrington <bryce@bryceharrington.org>
+Date: Thu Mar 12 16:56:57 2009 -0700
+
+ Add missing pci id for GeForce 7100 GS
+
+ Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit 74758ef3b184a37d211572d0deb826bd30d0de13
+Author: Chris Ball <cjb@laptop.org>
+Date: Fri Feb 27 10:55:11 2009 -0500
+
+ Revert "Build fix: set EXA_DRIVER_KNOWN_MAJOR=3"
+
+ This reverts commit 492513bf047f7660ef9fd32fda7ebc28704079be.
+ The EXA developers have backed out this ABI bump.
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
+
+commit 492513bf047f7660ef9fd32fda7ebc28704079be
+Author: Chris Ball <cjb@laptop.org>
+Date: Tue Feb 24 23:44:47 2009 -0500
+
+ Build fix: set EXA_DRIVER_KNOWN_MAJOR=3
+
+ EXA in server HEAD requires this now. Since this driver doesn't
+ use {Prepare,Finish}Access or UploadToScratch, the change is safe.
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
+
+commit b9140a510efa49b36973d02f1e110d33d22e653d
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Tue Feb 3 13:28:07 2009 -0800
+
+ Add NV_/RIVA_ prefixes to fix build warnings.
+
+ xserver commit 5e0967f5 pollutes the namespace by adding a "SetBit" macro to
+ inputstr.h that conflicts with the preexisting ones in nv_type.h and
+ riva_type.h.
+
+commit 3890a0aefc4c133999a10fad9d32745b635634ac
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 30 20:43:04 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+commit 302ffbefb880afb7e297c4a41ed3c106b7623fdb
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 9 16:31:55 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
+commit 6c6511f4bd933410778e93429bd37e2f24b78618
+Author: Chris Ball <cjb@laptop.org>
+Date: Mon Nov 3 20:08:32 2008 -0500
+
+ Build fix, s/pNv->/pRiva->/.
+
+ Fixes 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3.
+
+commit 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 3 15:01:58 2008 -0500
+
+ Do E-EDID if built against a server that supports it.
+
+commit b5f33108fea77280c9acd219954f20401f760faf
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Oct 27 17:54:36 2008 -0400
+
+ Adjust the nv34 panel tweak for Toshiba Tecra M2.
+
+commit e387bf31aae78d4447b4af555a8d09f79f72e6e7
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Oct 17 20:45:18 2008 -0700
+
+ Only match PCI display devices in our display driver.
+
+ Apparently the server needs the driver to tell it that no, we really don't want
+ screen sections on our NIC, USB hubs, bridge devices, etc.
+
+ Stop whining about PROBE_DETECT in G80 PreInit and just bail out instead.
+
+ Bug #18099: Xorg -configure tries to create a screen for every nvidia device.
+
commit 27e2a98531e8b190a73d126508400283e0fb02df
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Aug 28 11:19:04 2008 -0700
@@ -547,7 +647,7 @@ Date: Mon Jun 4 22:38:14 2007 -0700
Move some register writes into G80CreateSor.
commit 402b1d1526f0dacd2e3a2564cc89958c32d3100e
-Merge: 1f4790a... 9b8470e...
+Merge: 1f4790a 9b8470e
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun Jun 3 11:18:50 2007 +1000
@@ -619,7 +719,7 @@ Date: Mon Apr 16 02:23:26 2007 -0700
No acceleration yet.
commit c6e4105ce40ef053e026cc0ffe4925ab568ea700
-Merge: 5d9b75b... 4ff648c...
+Merge: 5d9b75b 4ff648c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 24 15:43:48 2007 -0700
diff --git a/debian/changelog b/debian/changelog
index da7aab5..0c48145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.13-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Apr 2009 10:41:22 +0100
+
xserver-xorg-video-nv (1:2.1.12-2) experimental; urgency=low
* Build against Xserver 1.6rc1.
commit df87eaf191209b0f1619ea74dc9fb0314b6fd288
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 7 13:40:36 2009 -0400
nv 2.1.13
diff --git a/Makefile.am b/Makefile.am
index d2f5b56..cdce83e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,6 @@ CLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index c87b553..bd26111 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nv],
- 2.1.12,
+ 2.1.13,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nv)
commit c0cc7d1247798867c695aeddcffe88edacbb6c7c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 7 13:34:26 2009 -0400
Remove README.NV1
There's no nv1 support here, so.
diff --git a/Makefile.am b/Makefile.am
index aa4996b..d2f5b56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man compat
-EXTRA_DIST = README.NV1 README.G80 ChangeLog
+EXTRA_DIST = README.G80 ChangeLog
CLEANFILES = ChangeLog
.PHONY: ChangeLog
diff --git a/README.NV1 b/README.NV1
deleted file mode 100644
index d209d5f..0000000
--- a/README.NV1
+++ /dev/null
@@ -1,42 +0,0 @@
- Information for NVidia NV1 / SGS-Thomson STG2000 Users
-
- David McKay
-
- 20th March 1997
-
-1. XFree driver for NVidia NV1 / SGS-Thomson STG2000 v1.0
-
-This driver now accelerates bitblits and filled rectangles. It also support a
-hardware cursor. More graphic acceleration is planned. There is no plan to
-support the audio functionality of the chip.
-
-1.1 Notes
-
- o THE DRIVER DOES NOT SUPPORT THE VIRTUAL DESKTOP FEATURES OF XFREE86 This
- is because the NV1 does not have the necessary hardware to support this
- feature. If you want to change resolutions, you will have to modify your
- config file. Comment out all but the mode you wish to use.
-
- o The generic VGA16 server will not work with the NV1. For this reason
- XF86Setup cannot be used to configure the server. Use xf86config
- instead. Select `Diamond Edge 3D' as your board, and select only ONE
- mode for each of 8bpp and 16bpp. Do not select a virtual desktop.
- Also, make sure you don't select a RAMDAC or clock chip.
-
- o The NV1 only supports a 555 RGB Weight in 16 bpp, the hardware does not
- do 565. You must put a Weight 555 in the Display section.
-
- o 24/32 bpp mode is not yet supported.
-
-1.2 Known Bugs
-
- o The driver should force Weight 555 in 16 bpp mode
-
- o The hardware cursor doesn't work if an doublescan mode is selected.
-
- o Screen blanking doesn't work, nor does DPMS.
-
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NV1.sgml,v 3.3 1997/03/22 09:35:30 hohndel Exp $
-
-
-$XFree86$
commit b278aca7d7b92b7fd62045d1aab44d78f694d608
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Mar 12 16:56:57 2009 -0700
Add missing pci id for GeForce 7100 GS
Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
diff --git a/src/nv_driver.c b/src/nv_driver.c
index faf73a9..20f96fb 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -303,6 +303,7 @@ static SymTabRec NVKnownChipsets[] =
{ 0x10DE0167, "GeForce Go 6200" },
{ 0x10DE0168, "GeForce Go 6400" },
{ 0x10DE0169, "GeForce 6250" },
+ { 0x10DE016A, "GeForce 7100 GS" },
{ 0x10DE0211, "GeForce 6800" },
{ 0x10DE0212, "GeForce 6800 LE" },
commit 74758ef3b184a37d211572d0deb826bd30d0de13
Author: Chris Ball <cjb@laptop.org>
Date: Fri Feb 27 10:55:11 2009 -0500
Revert "Build fix: set EXA_DRIVER_KNOWN_MAJOR=3"
This reverts commit 492513bf047f7660ef9fd32fda7ebc28704079be.
The EXA developers have backed out this ABI bump.
Signed-off-by: Chris Ball <cjb@laptop.org>
diff --git a/configure.ac b/configure.ac
index 795dd4b..c87b553 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,9 +74,6 @@ CFLAGS="$XORG_CFLAGS"
# RandR 1.2
AC_CHECK_HEADER(xf86Modes.h,[BUILD_XMODES=no],[BUILD_XMODES=yes],[#include "xorg-server.h"])
-# Required by exa.h
-AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
-
# PCI rework
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
commit 492513bf047f7660ef9fd32fda7ebc28704079be
Author: Chris Ball <cjb@laptop.org>
Date: Tue Feb 24 23:44:47 2009 -0500
Build fix: set EXA_DRIVER_KNOWN_MAJOR=3
EXA in server HEAD requires this now. Since this driver doesn't
use {Prepare,Finish}Access or UploadToScratch, the change is safe.
Signed-off-by: Chris Ball <cjb@laptop.org>
diff --git a/configure.ac b/configure.ac
index c87b553..795dd4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,9 @@ CFLAGS="$XORG_CFLAGS"
# RandR 1.2
AC_CHECK_HEADER(xf86Modes.h,[BUILD_XMODES=no],[BUILD_XMODES=yes],[#include "xorg-server.h"])
+# Required by exa.h
+AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
+
# PCI rework
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit b9140a510efa49b36973d02f1e110d33d22e653d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Feb 3 13:28:07 2009 -0800
Add NV_/RIVA_ prefixes to fix build warnings.
xserver commit 5e0967f5 pollutes the namespace by adding a "SetBit" macro to
inputstr.h that conflicts with the preexisting ones in nv_type.h and
riva_type.h.
diff --git a/src/nv_dac.c b/src/nv_dac.c
index a256d0a..b6df107 100644
--- a/src/nv_dac.c
+++ b/src/nv_dac.c
@@ -118,58 +118,58 @@ NVDACInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
horizTotal += 2;
}
- pVga->CRTC[0x0] = Set8Bits(horizTotal);
- pVga->CRTC[0x1] = Set8Bits(horizDisplay);
- pVga->CRTC[0x2] = Set8Bits(horizBlankStart);
- pVga->CRTC[0x3] = SetBitField(horizBlankEnd,4:0,4:0)
- | SetBit(7);
- pVga->CRTC[0x4] = Set8Bits(horizStart);
- pVga->CRTC[0x5] = SetBitField(horizBlankEnd,5:5,7:7)
- | SetBitField(horizEnd,4:0,4:0);
- pVga->CRTC[0x6] = SetBitField(vertTotal,7:0,7:0);
- pVga->CRTC[0x7] = SetBitField(vertTotal,8:8,0:0)
- | SetBitField(vertDisplay,8:8,1:1)
- | SetBitField(vertStart,8:8,2:2)
- | SetBitField(vertBlankStart,8:8,3:3)
- | SetBit(4)
- | SetBitField(vertTotal,9:9,5:5)
- | SetBitField(vertDisplay,9:9,6:6)
- | SetBitField(vertStart,9:9,7:7);
- pVga->CRTC[0x9] = SetBitField(vertBlankStart,9:9,5:5)
- | SetBit(6)
+ pVga->CRTC[0x0] = NV_Set8Bits(horizTotal);
+ pVga->CRTC[0x1] = NV_Set8Bits(horizDisplay);
+ pVga->CRTC[0x2] = NV_Set8Bits(horizBlankStart);
+ pVga->CRTC[0x3] = NV_SetBitField(horizBlankEnd,4:0,4:0)
+ | NV_SetBit(7);
+ pVga->CRTC[0x4] = NV_Set8Bits(horizStart);
+ pVga->CRTC[0x5] = NV_SetBitField(horizBlankEnd,5:5,7:7)
+ | NV_SetBitField(horizEnd,4:0,4:0);
+ pVga->CRTC[0x6] = NV_SetBitField(vertTotal,7:0,7:0);
+ pVga->CRTC[0x7] = NV_SetBitField(vertTotal,8:8,0:0)
+ | NV_SetBitField(vertDisplay,8:8,1:1)
+ | NV_SetBitField(vertStart,8:8,2:2)
+ | NV_SetBitField(vertBlankStart,8:8,3:3)
+ | NV_SetBit(4)
+ | NV_SetBitField(vertTotal,9:9,5:5)
+ | NV_SetBitField(vertDisplay,9:9,6:6)
+ | NV_SetBitField(vertStart,9:9,7:7);
+ pVga->CRTC[0x9] = NV_SetBitField(vertBlankStart,9:9,5:5)
+ | NV_SetBit(6)
| ((mode->Flags & V_DBLSCAN) ? 0x80 : 0x00);
- pVga->CRTC[0x10] = Set8Bits(vertStart);
- pVga->CRTC[0x11] = SetBitField(vertEnd,3:0,3:0) | SetBit(5);
- pVga->CRTC[0x12] = Set8Bits(vertDisplay);
+ pVga->CRTC[0x10] = NV_Set8Bits(vertStart);
+ pVga->CRTC[0x11] = NV_SetBitField(vertEnd,3:0,3:0) | NV_SetBit(5);
+ pVga->CRTC[0x12] = NV_Set8Bits(vertDisplay);
pVga->CRTC[0x13] = ((pLayout->displayWidth/8)*(pLayout->bitsPerPixel/8));
- pVga->CRTC[0x15] = Set8Bits(vertBlankStart);
- pVga->CRTC[0x16] = Set8Bits(vertBlankEnd);
+ pVga->CRTC[0x15] = NV_Set8Bits(vertBlankStart);
+ pVga->CRTC[0x16] = NV_Set8Bits(vertBlankEnd);
pVga->Attribute[0x10] = 0x01;
if(pNv->Television)
pVga->Attribute[0x11] = 0x00;
- nvReg->screen = SetBitField(horizBlankEnd,6:6,4:4)
- | SetBitField(vertBlankStart,10:10,3:3)
- | SetBitField(vertStart,10:10,2:2)
- | SetBitField(vertDisplay,10:10,1:1)
- | SetBitField(vertTotal,10:10,0:0);
+ nvReg->screen = NV_SetBitField(horizBlankEnd,6:6,4:4)
+ | NV_SetBitField(vertBlankStart,10:10,3:3)
+ | NV_SetBitField(vertStart,10:10,2:2)
+ | NV_SetBitField(vertDisplay,10:10,1:1)
+ | NV_SetBitField(vertTotal,10:10,0:0);
- nvReg->horiz = SetBitField(horizTotal,8:8,0:0)
- | SetBitField(horizDisplay,8:8,1:1)
- | SetBitField(horizBlankStart,8:8,2:2)
- | SetBitField(horizStart,8:8,3:3);
+ nvReg->horiz = NV_SetBitField(horizTotal,8:8,0:0)
+ | NV_SetBitField(horizDisplay,8:8,1:1)
+ | NV_SetBitField(horizBlankStart,8:8,2:2)
+ | NV_SetBitField(horizStart,8:8,3:3);
- nvReg->extra = SetBitField(vertTotal,11:11,0:0)
- | SetBitField(vertDisplay,11:11,2:2)
- | SetBitField(vertStart,11:11,4:4)
- | SetBitField(vertBlankStart,11:11,6:6);
+ nvReg->extra = NV_SetBitField(vertTotal,11:11,0:0)
+ | NV_SetBitField(vertDisplay,11:11,2:2)
+ | NV_SetBitField(vertStart,11:11,4:4)
+ | NV_SetBitField(vertBlankStart,11:11,6:6);
if(mode->Flags & V_INTERLACE) {
horizTotal = (horizTotal >> 1) & ~1;
- nvReg->interlace = Set8Bits(horizTotal);
- nvReg->horiz |= SetBitField(horizTotal,8:8,4:4);
+ nvReg->interlace = NV_Set8Bits(horizTotal);
+ nvReg->horiz |= NV_SetBitField(horizTotal,8:8,4:4);
} else {
nvReg->interlace = 0xff; /* interlace off */
}
diff --git a/src/nv_type.h b/src/nv_type.h
index 2710c5a..8ebb9a8 100644
--- a/src/nv_type.h
+++ b/src/nv_type.h
@@ -14,13 +14,13 @@
#define NV_ARCH_40 0x40
-#define BITMASK(t,b) (((unsigned)(1U << (((t)-(b)+1)))-1) << (b))
-#define MASKEXPAND(mask) BITMASK(1?mask,0?mask)
-#define SetBF(mask,value) ((value) << (0?mask))
-#define GetBF(var,mask) (((unsigned)((var) & MASKEXPAND(mask))) >> (0?mask) )
-#define SetBitField(value,from,to) SetBF(to, GetBF(value,from))
-#define SetBit(n) (1<<(n))
-#define Set8Bits(value) ((value)&0xff)
+#define NV_BITMASK(t,b) (((unsigned)(1U << (((t)-(b)+1)))-1) << (b))
+#define NV_MASKEXPAND(mask) NV_BITMASK(1?mask,0?mask)
+#define NV_SetBF(mask,value) ((value) << (0?mask))
+#define NV_GetBF(var,mask) (((unsigned)((var) & NV_MASKEXPAND(mask))) >> (0?mask) )
+#define NV_SetBitField(value,from,to) NV_SetBF(to, NV_GetBF(value,from))
+#define NV_SetBit(n) (1<<(n))
+#define NV_Set8Bits(value) ((value)&0xff)
typedef struct {
int bitsPerPixel;
diff --git a/src/riva_dac.c b/src/riva_dac.c
index 6e9f346..9b7b518 100644
--- a/src/riva_dac.c
+++ b/src/riva_dac.c
@@ -67,55 +67,55 @@ RivaDACInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
if(mode->Flags & V_INTERLACE)
vertTotal |= 1;
- pVga->CRTC[0x0] = Set8Bits(horizTotal);
- pVga->CRTC[0x1] = Set8Bits(horizDisplay);
- pVga->CRTC[0x2] = Set8Bits(horizBlankStart);
- pVga->CRTC[0x3] = SetBitField(horizBlankEnd,4:0,4:0)
- | SetBit(7);
- pVga->CRTC[0x4] = Set8Bits(horizStart);
- pVga->CRTC[0x5] = SetBitField(horizBlankEnd,5:5,7:7)
- | SetBitField(horizEnd,4:0,4:0);
- pVga->CRTC[0x6] = SetBitField(vertTotal,7:0,7:0);
- pVga->CRTC[0x7] = SetBitField(vertTotal,8:8,0:0)
- | SetBitField(vertDisplay,8:8,1:1)
- | SetBitField(vertStart,8:8,2:2)
- | SetBitField(vertBlankStart,8:8,3:3)
- | SetBit(4)
- | SetBitField(vertTotal,9:9,5:5)
- | SetBitField(vertDisplay,9:9,6:6)
- | SetBitField(vertStart,9:9,7:7);
- pVga->CRTC[0x9] = SetBitField(vertBlankStart,9:9,5:5)
- | SetBit(6)
+ pVga->CRTC[0x0] = RIVA_Set8Bits(horizTotal);
+ pVga->CRTC[0x1] = RIVA_Set8Bits(horizDisplay);
+ pVga->CRTC[0x2] = RIVA_Set8Bits(horizBlankStart);
+ pVga->CRTC[0x3] = RIVA_SetBitField(horizBlankEnd,4:0,4:0)
+ | RIVA_SetBit(7);
+ pVga->CRTC[0x4] = RIVA_Set8Bits(horizStart);
+ pVga->CRTC[0x5] = RIVA_SetBitField(horizBlankEnd,5:5,7:7)
+ | RIVA_SetBitField(horizEnd,4:0,4:0);
+ pVga->CRTC[0x6] = RIVA_SetBitField(vertTotal,7:0,7:0);
+ pVga->CRTC[0x7] = RIVA_SetBitField(vertTotal,8:8,0:0)
+ | RIVA_SetBitField(vertDisplay,8:8,1:1)
+ | RIVA_SetBitField(vertStart,8:8,2:2)
+ | RIVA_SetBitField(vertBlankStart,8:8,3:3)
+ | RIVA_SetBit(4)
+ | RIVA_SetBitField(vertTotal,9:9,5:5)
+ | RIVA_SetBitField(vertDisplay,9:9,6:6)
+ | RIVA_SetBitField(vertStart,9:9,7:7);
+ pVga->CRTC[0x9] = RIVA_SetBitField(vertBlankStart,9:9,5:5)
+ | RIVA_SetBit(6)
| ((mode->Flags & V_DBLSCAN) ? 0x80 : 0x00);
- pVga->CRTC[0x10] = Set8Bits(vertStart);
- pVga->CRTC[0x11] = SetBitField(vertEnd,3:0,3:0) | SetBit(5);
- pVga->CRTC[0x12] = Set8Bits(vertDisplay);
+ pVga->CRTC[0x10] = RIVA_Set8Bits(vertStart);
+ pVga->CRTC[0x11] = RIVA_SetBitField(vertEnd,3:0,3:0) | RIVA_SetBit(5);
+ pVga->CRTC[0x12] = RIVA_Set8Bits(vertDisplay);
pVga->CRTC[0x13] = ((pLayout->displayWidth/8)*(pLayout->bitsPerPixel/8));
- pVga->CRTC[0x15] = Set8Bits(vertBlankStart);
- pVga->CRTC[0x16] = Set8Bits(vertBlankEnd);
+ pVga->CRTC[0x15] = RIVA_Set8Bits(vertBlankStart);
+ pVga->CRTC[0x16] = RIVA_Set8Bits(vertBlankEnd);
pVga->Attribute[0x10] = 0x01;
- rivaReg->screen = SetBitField(horizBlankEnd,6:6,4:4)
- | SetBitField(vertBlankStart,10:10,3:3)
- | SetBitField(vertStart,10:10,2:2)
- | SetBitField(vertDisplay,10:10,1:1)
- | SetBitField(vertTotal,10:10,0:0);
+ rivaReg->screen = RIVA_SetBitField(horizBlankEnd,6:6,4:4)
+ | RIVA_SetBitField(vertBlankStart,10:10,3:3)
+ | RIVA_SetBitField(vertStart,10:10,2:2)
+ | RIVA_SetBitField(vertDisplay,10:10,1:1)
+ | RIVA_SetBitField(vertTotal,10:10,0:0);
- rivaReg->horiz = SetBitField(horizTotal,8:8,0:0)
- | SetBitField(horizDisplay,8:8,1:1)
- | SetBitField(horizBlankStart,8:8,2:2)
- | SetBitField(horizStart,8:8,3:3);
+ rivaReg->horiz = RIVA_SetBitField(horizTotal,8:8,0:0)
+ | RIVA_SetBitField(horizDisplay,8:8,1:1)
+ | RIVA_SetBitField(horizBlankStart,8:8,2:2)
+ | RIVA_SetBitField(horizStart,8:8,3:3);
- rivaReg->extra = SetBitField(vertTotal,11:11,0:0)
- | SetBitField(vertDisplay,11:11,2:2)
- | SetBitField(vertStart,11:11,4:4)
- | SetBitField(vertBlankStart,11:11,6:6);
+ rivaReg->extra = RIVA_SetBitField(vertTotal,11:11,0:0)
+ | RIVA_SetBitField(vertDisplay,11:11,2:2)
+ | RIVA_SetBitField(vertStart,11:11,4:4)
+ | RIVA_SetBitField(vertBlankStart,11:11,6:6);
if(mode->Flags & V_INTERLACE) {
horizTotal = (horizTotal >> 1) & ~1;
- rivaReg->interlace = Set8Bits(horizTotal);
- rivaReg->horiz |= SetBitField(horizTotal,8:8,4:4);
+ rivaReg->interlace = RIVA_Set8Bits(horizTotal);
+ rivaReg->horiz |= RIVA_SetBitField(horizTotal,8:8,4:4);
} else {
rivaReg->interlace = 0xff; /* interlace off */
}
diff --git a/src/riva_type.h b/src/riva_type.h
index e9448e6..5a1317f 100644
--- a/src/riva_type.h
+++ b/src/riva_type.h
@@ -9,13 +9,13 @@
#include "xf86int10.h"
-#define BITMASK(t,b) (((unsigned)(1U << (((t)-(b)+1)))-1) << (b))
-#define MASKEXPAND(mask) BITMASK(1?mask,0?mask)
-#define SetBF(mask,value) ((value) << (0?mask))
-#define GetBF(var,mask) (((unsigned)((var) & MASKEXPAND(mask))) >> (0?mask) )
-#define SetBitField(value,from,to) SetBF(to, GetBF(value,from))
-#define SetBit(n) (1<<(n))
-#define Set8Bits(value) ((value)&0xff)
+#define RIVA_BITMASK(t,b) (((unsigned)(1U << (((t)-(b)+1)))-1) << (b))
+#define RIVA_MASKEXPAND(mask) RIVA_BITMASK(1?mask,0?mask)
+#define RIVA_SetBF(mask,value) ((value) << (0?mask))
+#define RIVA_GetBF(var,mask) (((unsigned)((var) & RIVA_MASKEXPAND(mask))) >> (0?mask) )
+#define RIVA_SetBitField(value,from,to) RIVA_SetBF(to, RIVA_GetBF(value,from))
+#define RIVA_SetBit(n) (1<<(n))
+#define RIVA_Set8Bits(value) ((value)&0xff)
typedef RIVA_HW_STATE* RivaRegPtr;
commit dd159ed47482b2823aa24f66fd1df81af4b2e66f
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Feb 1 19:38:16 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index cc4822e..da7aab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-nv (1:2.1.12-2) UNRELEASED; urgency=low
+xserver-xorg-video-nv (1:2.1.12-2) experimental; urgency=low
* Build against Xserver 1.6rc1.
- -- Brice Goglin <bgoglin@debian.org> Sun, 01 Feb 2009 19:37:35 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 01 Feb 2009 19:38:09 +0100
xserver-xorg-video-nv (1:2.1.12-1) experimental; urgency=low
commit 0efafa1e88f5b3cdea73ee1dadec3f1d7a8f825e
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Feb 1 19:38:04 2009 +0100
Build against Xserver 1.6rc1
diff --git a/debian/changelog b/debian/changelog
index ba9bd5b..cc4822e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.12-2) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.6rc1.
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 01 Feb 2009 19:37:35 +0100
+
xserver-xorg-video-nv (1:2.1.12-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 1b9c051..79ba5a9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.5.99.901),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit 8f75f89ab304aaa93398edfe194f4976fa30340f
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Feb 1 19:37:20 2009 +0100
Wrap build-deps
diff --git a/debian/control b/debian/control
index be91a14..1b9c051 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,21 @@ 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.5), 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), automake, libtool, xutils-dev
+Build-Depends:
+ debhelper (>= 5.0.0),
+ pkg-config,
+ quilt,
+ xserver-xorg-dev (>= 2:1.5),
+ 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),
+ automake,
+ libtool,
+ xutils-dev
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 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+ exit 0
+fi
+
+if [ "x$1" != x--upstream-version ]; then
+ exit 1
+fi
+
+version="$2"
+filename="$3"
+
+if [ -z "$version" ] || ! [ -f "$filename" ]; then
+ exit 1
+fi
+
+dir="$(pwd)"
+tempdir="$(mktemp -d)"
+
+cd "$tempdir"
+tar xf "$dir/$filename"
+cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf "$dir/$filename" *
+cd "$dir"
+rm -rf "$tempdir"
+echo "Done pruning upstream tarball"
+
+exit 0
commit 3890a0aefc4c133999a10fad9d32745b635634ac
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:43:04 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..b4442d1
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-nv - NVIDIA video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-nv
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-nv
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit 302ffbefb880afb7e297c4a41ed3c106b7623fdb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:31:55 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/nv.man b/man/nv.man
index 2d559e6..e37782d 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -191,7 +191,7 @@ Default:
.\" ******************** end G80 section ********************
.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), xrandr(__appmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), xrandr(__appmansuffix__)
.SH AUTHORS
Authors include: David McKay, Jarno Paananen, Chas Inman, Dave Schmenk,
Mark Vojkovich, Aaron Plattner
commit 6c6511f4bd933410778e93429bd37e2f24b78618
Author: Chris Ball <cjb@laptop.org>
Date: Mon Nov 3 20:08:32 2008 -0500
Build fix, s/pNv->/pRiva->/.
Fixes 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3.
diff --git a/src/riva_setup.c b/src/riva_setup.c
index b616798..64726f7 100644
--- a/src/riva_setup.c
+++ b/src/riva_setup.c
@@ -168,9 +168,9 @@ RivaProbeDDC (ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probing for EDID...\n");
#ifdef EDID_COMPLETE_RAWDATA
- MonInfo = xf86DoEEDID(pScrn->scrnIndex, pNv->I2C, TRUE);
+ MonInfo = xf86DoEEDID(pScrn->scrnIndex, pRiva->I2C, TRUE);
#else
- MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C);
+ MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pRiva->I2C);
#endif
if (MonInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 3 15:01:58 2008 -0500
Do E-EDID if built against a server that supports it.
diff --git a/src/g80_output.c b/src/g80_output.c
index e906fbb..420a73e 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -307,7 +307,11 @@ ProbeDDC(I2CBusPtr i2c)
"Probing for EDID on I2C bus %i...\n", bus);
pNv->reg[addr/4] = 7;
/* Should probably use xf86OutputGetEDID here */
+#ifdef EDID_COMPLETE_RAWDATA
+ monInfo = xf86DoEEDID(pScrn->scrnIndex, i2c, TRUE);
+#else
monInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, i2c);
+#endif
pNv->reg[addr/4] = 3;
if(monInfo) {
diff --git a/src/nv_setup.c b/src/nv_setup.c
index bea0050..132a96b 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -229,7 +229,12 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Probing for EDID on I2C bus %s...\n", bus ? "B" : "A");
- if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C))) {
+#ifdef EDID_COMPLETE_RAWDATA
+ MonInfo = xf86DoEEDID(pScrn->scrnIndex, pNv->I2C, TRUE);
+#else
+ MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C);
+#endif
+ if (MonInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"DDC detected a %s:\n", MonInfo->features.input_type ?
"DFP" : "CRT");
diff --git a/src/riva_setup.c b/src/riva_setup.c
index b7352b6..b616798 100644
--- a/src/riva_setup.c
+++ b/src/riva_setup.c
@@ -167,7 +167,12 @@ RivaProbeDDC (ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probing for EDID...\n");
- if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pRiva->I2C))) {
Reply to: