xserver-xorg-video-nouveau: Changes to 'debian-experimental'
ChangeLog | 338 ++++++++
configure.ac | 15
debian/NEWS.Debian | 8
debian/README.Debian | 23
debian/changelog | 19
debian/control | 2
debian/xorg.conf | 6
debian/xserver-xorg-video-nouveau.examples | 1
man/nouveau.man | 3
src/Makefile.am | 3
src/drmmode_display.c | 42 -
src/nouveau_class.h | 975 -----------------------
src/nouveau_dri2.c | 20
src/nouveau_exa.c | 50 +
src/nouveau_local.h | 3
src/nouveau_wfb.c | 5
src/nouveau_xv.c | 59 +
src/nv04_exa.c | 8
src/nv04_xv_blit.c | 2
src/nv10_exa.c | 1
src/nv30_exa.c | 1
src/nv30_shaders.c | 1
src/nv30_xv_tex.c | 1
src/nv40_exa.c | 1
src/nv40_xv_tex.c | 1
src/nv50_accel.c | 41
src/nv50_accel.h | 12
src/nv50_defs.xml.h | 144 +++
src/nv50_exa.c | 5
src/nv50_xv.c | 141 +++
src/nv_3ddefs.xml.h | 93 ++
src/nv_accel_common.c | 91 +-
src/nv_const.h | 2
src/nv_dma.c | 21
src/nv_driver.c | 38
src/nv_include.h | 2
src/nv_object.xml.h | 246 +++++
src/nv_proto.h | 37
src/nvc0_3d.xml.h | 1093 ++++++++++++++++++++++++++
src/nvc0_accel.c | 731 +++++++++++++++++
src/nvc0_accel.h | 83 +
src/nvc0_exa.c | 1204 +++++++++++++++++++++++++++++
src/nvc0_m2mf.xml.h | 138 +++
src/nvc0_xv.c | 427 ++++++++++
44 files changed, 5004 insertions(+), 1133 deletions(-)
New commits:
commit b9223f7471fb6ace5501ef7970d76f29439a0cb6
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 11:46:21 2011 +0100
Remove the sample xorg.conf
It is not needed and may even be harmful because it prevents X from
falling back to fbdev in case of a DRM ABI mismatch between kernel and
userspace.
diff --git a/debian/changelog b/debian/changelog
index 0e91913..b7fc431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=
work as of Linux 2.6.35.
- Don't mention nv anymore, it has been removed from Debian.
* Drop unnecessary leading asterisk from NEWS.Debian.
+ * Drop the sample xorg.conf, no longer needed.
-- Sven Joachim <svenjoac@gmx.de> Sat, 05 Mar 2011 10:13:42 +0100
diff --git a/debian/xorg.conf b/debian/xorg.conf
deleted file mode 100644
index 5cc6911..0000000
--- a/debian/xorg.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Minimal xorg.conf for the Nouveau driver
-
-Section "Device"
- Identifier "Default screen"
- Driver "nouveau"
-EndSection
diff --git a/debian/xserver-xorg-video-nouveau.examples b/debian/xserver-xorg-video-nouveau.examples
deleted file mode 100644
index c28ba96..0000000
--- a/debian/xserver-xorg-video-nouveau.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/xorg.conf
commit 9c2b34c298f4b5785a3503058b40a3fda40bb298
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 11:23:58 2011 +0100
Drop unnecessary leading asterisk from NEWS.Debian
Fixes a lintian informational warning.
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 5df80f4..b585dd1 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,7 +1,7 @@
xserver-xorg-video-nouveau (1:0.0.16+git20100518+4b8f1a0-1) experimental; urgency=low
-
- * This version of xserver-xorg-video-nouveau is linked against a newer
- libdrm-nouveau which breaks the ABI and is not compatible with kernels
- <= 2.6.33. You need to upgrade the kernel to 2.6.34-rc1 or newer.
+
+ This version of xserver-xorg-video-nouveau is linked against a newer
+ libdrm-nouveau which breaks the ABI and is not compatible with kernels
+ <= 2.6.33. You need to upgrade the kernel to 2.6.34-rc1 or newer.
-- Sven Joachim <svenjoac@gmx.de> Sat, 22 May 2010 10:22:42 +0200
diff --git a/debian/changelog b/debian/changelog
index e37b178..0e91913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=
- Drop vga16fb from the list of incompatible drivers, KMS handover should
work as of Linux 2.6.35.
- Don't mention nv anymore, it has been removed from Debian.
+ * Drop unnecessary leading asterisk from NEWS.Debian.
-- Sven Joachim <svenjoac@gmx.de> Sat, 05 Mar 2011 10:13:42 +0100
commit b3f9aa83aa224108d9da32e45c8ecfcbe658944b
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 11:20:04 2011 +0100
Update README.Debian for NVC0 firmware
diff --git a/debian/README.Debian b/debian/README.Debian
index c616e0e..c577195 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,8 +10,10 @@ nouveau module altogether or contain an incompatible version. If you
build your own kernel, you have to enable the module under Drivers ->
Staging drivers.
-There's no need for any firmware at all, the Linux kernel takes care of
-that automatically.
+Fermi cards (GeForce 4xx/5xx series, NVC0 in Nouveau terminology)
+currently need non-free and not readily available firmware to provide
+any acceleration. At http://nouveau.freedesktop.org/wiki/NVC0_Firmware
+you can find intructions how to extract it from the blob.
Incompatibilities with other drivers
@@ -74,4 +76,4 @@ http://nouveau.freedesktop.org/wiki/FAQ
http://nouveau.freedesktop.org/wiki/TroubleShooting
http://nouveau.freedesktop.org/wiki/KernelModeSetting
- -- Sven Joachim <svenjoac@gmx.de>, Sat, 5 Mar 2011 10:57:32 +0100
+ -- Sven Joachim <svenjoac@gmx.de>, Sat, 5 Mar 2011 11:13:05 +0100
diff --git a/debian/changelog b/debian/changelog
index 53819dd..e37b178 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=
* New upstream snapshot.
- Fixes sluggish rendering of X core fonts (Closes: #614938).
+ - Better support for NVC0 (aka Fermi) cards. Linux 2.6.38 and not readily
+ available firmware is required for acceleration, see README.Debian.
- Bump build-dependency on libdrm-dev to (>= 2.4.24) due to
libdrm-nouveau API changes.
* Update README.Debian:
commit d13058a17ea93f73eca13d1c262160b292475ae4
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 10:59:45 2011 +0100
Drop references to nv from README.Debian
The xserver-xorg-video-nv package has been removed from Debian.
diff --git a/debian/README.Debian b/debian/README.Debian
index 38f750f..c616e0e 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,8 +24,8 @@ including the Nvidia proprietary driver. Among others, the following
kernel modules must not be loaded before nouveau: nvidiafb, rivafb and
nvidia. Note that vesafb should not be a problem.
-If you decide to switch to nv or the proprietary driver, it is highly
-recommended to reboot because they are incompatible with nouveau, and
+If you decide to switch to the proprietary driver, it is highly
+recommended to reboot because it is incompatible with nouveau, and
unloading the latter is not easy and may lead to a blank console.
@@ -74,4 +74,4 @@ http://nouveau.freedesktop.org/wiki/FAQ
http://nouveau.freedesktop.org/wiki/TroubleShooting
http://nouveau.freedesktop.org/wiki/KernelModeSetting
- -- Sven Joachim <svenjoac@gmx.de>, Sat, 5 Mar 2011 10:53:27 +0100
+ -- Sven Joachim <svenjoac@gmx.de>, Sat, 5 Mar 2011 10:57:32 +0100
diff --git a/debian/changelog b/debian/changelog
index d1bbbe0..53819dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=
packages which divert the Mesa/Xorg files in Squeeze and later.
- Drop vga16fb from the list of incompatible drivers, KMS handover should
work as of Linux 2.6.35.
+ - Don't mention nv anymore, it has been removed from Debian.
-- Sven Joachim <svenjoac@gmx.de> Sat, 05 Mar 2011 10:13:42 +0100
commit b8d592438b4e3b66374a1a041f6a67e6635ad684
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 10:57:03 2011 +0100
Don't mention vga16fb as incompatible
KMS handover should work as of Linux 2.6.35.
diff --git a/debian/README.Debian b/debian/README.Debian
index 2bfd7ec..38f750f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -21,8 +21,8 @@ The nouveau kernel module includes a framebuffer driver for the
virtual console, giving you a nice high resolution text console.
Unfortunately, this is incompatible with other display drivers,
including the Nvidia proprietary driver. Among others, the following
-kernel modules must not be loaded before nouveau: vga16fb, nvidiafb,
-rivafb and nvidia. Note that vesafb should not be a problem.
+kernel modules must not be loaded before nouveau: nvidiafb, rivafb and
+nvidia. Note that vesafb should not be a problem.
If you decide to switch to nv or the proprietary driver, it is highly
recommended to reboot because they are incompatible with nouveau, and
@@ -74,4 +74,4 @@ http://nouveau.freedesktop.org/wiki/FAQ
http://nouveau.freedesktop.org/wiki/TroubleShooting
http://nouveau.freedesktop.org/wiki/KernelModeSetting
- -- Sven Joachim <svenjoac@gmx.de>, Sat, 5 Mar 2011 10:45:13 +0100
+ -- Sven Joachim <svenjoac@gmx.de>, Sat, 5 Mar 2011 10:53:27 +0100
diff --git a/debian/changelog b/debian/changelog
index 2031d8a..d1bbbe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=
* Update README.Debian:
- Former nvidia-glx users should remove the libgl{1,x}-nvidia-alternatives
packages which divert the Mesa/Xorg files in Squeeze and later.
+ - Drop vga16fb from the list of incompatible drivers, KMS handover should
+ work as of Linux 2.6.35.
-- Sven Joachim <svenjoac@gmx.de> Sat, 05 Mar 2011 10:13:42 +0100
commit 2279bc3d60954adbed5aced227c8495916deb7b5
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 10:52:52 2011 +0100
Update README.Debian for new layout of nvidia packages
The libgl{1,x}-nvidia-alternatives packages, rather than nvidia-glx,
set up the diversions in Squeeze.
diff --git a/debian/README.Debian b/debian/README.Debian
index e9e0e01..2bfd7ec 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -36,9 +36,10 @@ The proprietary Nvidia driver comes with its own OpenGL implementation
that is incompatible with free drivers. To be able to use OpenGL
programs with nouveau, you need to uninstall the Nvidia files. If you
have used the nvidia-glx package or any of its legacy variants, it
-suffices to remove it. If you ran the Nvidia installer, you need to
-reinstall the xserver-xorg-core and libgl1-mesa-glx packages. In
-either case, restarting X is also necessary.
+suffices to remove the libgl1-nvidia-alternatives and
+libglx-nvidia-alternatives packages. If you ran the Nvidia installer,
+you need to reinstall the xserver-xorg-core and libgl1-mesa-glx
+packages. In either case, restarting X is also necessary.
A simple OpenGL test program is glxgears, contained in the mesa-utils
package. Note that OpenGL with nouveau will not be much fun, see the
@@ -73,4 +74,4 @@ http://nouveau.freedesktop.org/wiki/FAQ
http://nouveau.freedesktop.org/wiki/TroubleShooting
http://nouveau.freedesktop.org/wiki/KernelModeSetting
- -- Sven Joachim <svenjoac@gmx.de>, Mon, 4 Oct 2010 19:00:57 +0200
+ -- Sven Joachim <svenjoac@gmx.de>, Sat, 5 Mar 2011 10:45:13 +0100
diff --git a/debian/changelog b/debian/changelog
index af1d507..2031d8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=
- Fixes sluggish rendering of X core fonts (Closes: #614938).
- Bump build-dependency on libdrm-dev to (>= 2.4.24) due to
libdrm-nouveau API changes.
+ * Update README.Debian:
+ - Former nvidia-glx users should remove the libgl{1,x}-nvidia-alternatives
+ packages which divert the Mesa/Xorg files in Squeeze and later.
-- Sven Joachim <svenjoac@gmx.de> Sat, 05 Mar 2011 10:13:42 +0100
commit 67db73697a26714d7bc555143b2f3f86489be91c
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 10:39:18 2011 +0100
Close bug #614938
While https://bugs.freedesktop.org/show_bug.cgi?id=33977 is not marked
as resolved yet, commit 02c50db307a4e4eeb87f7db5d401bc53cce3b21f fixes
the problem for me.
diff --git a/debian/changelog b/debian/changelog
index 416c4bb..af1d507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=low
* New upstream snapshot.
+ - Fixes sluggish rendering of X core fonts (Closes: #614938).
- Bump build-dependency on libdrm-dev to (>= 2.4.24) due to
libdrm-nouveau API changes.
commit 92686b0ac77168a4baacb112bf0b51149c021aec
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 10:30:38 2011 +0100
Require libdrm-dev 2.4.24 for building
We need nv04_pushbuf.h which is not present in earlier libdrm versions.
diff --git a/debian/changelog b/debian/changelog
index 4a737b4..416c4bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=low
* New upstream snapshot.
+ - Bump build-dependency on libdrm-dev to (>= 2.4.24) due to
+ libdrm-nouveau API changes.
-- Sven Joachim <svenjoac@gmx.de> Sat, 05 Mar 2011 10:13:42 +0100
diff --git a/debian/control b/debian/control
index 3628426..9f7bc86 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
x11proto-randr-dev (>= 1.2),
x11proto-render-dev,
x11proto-xext-dev,
- libdrm-dev (>= 2.4.23),
+ libdrm-dev (>= 2.4.24),
x11proto-xf86dri-dev,
x11proto-gl-dev,
mesa-common-dev,
commit e510d6d2dbf0e8bbb0b2d6090c0cf7aa5f01811d
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Mar 5 10:15:27 2011 +0100
New upstream snapshot
diff --git a/ChangeLog b/ChangeLog
index 236cfda..416cf5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,341 @@
+commit 92db2bc192a074d4b7fc3e9c16e9aa62a8deaeb6
+Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+Date: Thu Mar 3 22:17:23 2011 +0100
+
+ nvc0/accel: allow nvc1,nvc3,nvc4 in 3D engine init and use 9097
+
+commit ace98a492353e6de712f4f717e6d3f562e3591f0
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Tue Mar 1 13:54:38 2011 +1000
+
+ dri2: return an error rather than crashing if we can't allocate a buffer
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit bc5dec2ca7ca7edc340a99bd73946e228117dfd8
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Thu Feb 24 15:15:00 2011 +1000
+
+ dri2: disable page flipping if any crtc is rotated
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit c123618470b5ff32c6377a4cae0f148d4a518a5d
+Author: Francesco Marella <francesco.marella@gmail.com>
+Date: Thu Feb 17 03:48:16 2011 +0100
+
+ Fix gcc 4.6.0 set but unused variable warnings
+
+ Signed-off-by: Francesco Marella <fmarl@paranoici.org>
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 3531b2aa13e9c78288d96fe5e1492f0b6e899b00
+Author: Francesco Marella <francesco.marella@gmail.com>
+Date: Thu Feb 17 03:47:46 2011 +0100
+
+ Page flipping man page update
+
+ Signed-off-by: Francesco Marella <fmarl@paranoici.org>
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 85a706df6f7986158c964e3afd0aa8e352ff5cea
+Author: Francesco Marella <francesco.marella@gmail.com>
+Date: Thu Feb 17 03:47:08 2011 +0100
+
+ Update configure.ac with autoupdate
+
+ Signed-off-by: Francesco Marella <fmarl@paranoici.org>
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 42c16ff33dcca6cd9bae62fe0d71a40452e03581
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Wed Feb 16 13:51:54 2011 +1000
+
+ nv50: attempt to allocate compressed Z buffers
+
+ This should automagically fallback to the non-compressed version on kernels
+ that don't support compression.
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 46acb7e095e9c0d55b90070b77c64679fcfb9d4e
+Author: Marcin Slusarz <marcin.slusarz@gmail.com>
+Date: Sun Feb 13 20:46:42 2011 +0100
+
+ fix drmSetMaster error reporting
+
+ On error, drmSetMaster returns -1 and sets errno.
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 54764980411b4b8124c36edb8730612b04f292a9
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Thu Feb 10 20:12:07 2011 +0100
+
+ Also flush from the BlockHandler.
+
+ - The fact that commit 02c50db307a4e4eeb87f7db5d401bc53cce3b21f
+ fixed missing text for some people proves this is needed.
+ That commit should have only improved latency a bit.
+ - The FlushCallback is still needed for DRI2 texture_from_pixmap.
+ - See bugs.fd.o #33977 for discussion.
+
+ Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 02c50db307a4e4eeb87f7db5d401bc53cce3b21f
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Mon Feb 7 19:37:47 2011 +0100
+
+ exa: Flush (S)IFC to the frontbuffer immediately.
+
+ This avoids high latency while typing with core fonts for example.
+
+ Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit e4fb9fd2f790ed66e4be61ca00d55522525619f4
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Wed Feb 9 13:46:32 2011 +1000
+
+ dri2: allow page flipping to be disabled in xorg.conf
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 38e8809bb415bae5c182fc79c8fc62992c5e4ed0
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon Jan 17 09:14:31 2011 +1000
+
+ nvc0: merge initial acceleration support
+
+ Squashed commit of the following:
+
+ commit e8ce1ef351ee51bec51211dca6fda88fdbfbefee
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Mon Jan 17 08:55:04 2011 +1000
+
+ fix hardcoding of nvc0 wfb path
+
+ commit b414b1f948da18d96309bad84c54948d877efaa6
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Mon Jan 17 08:52:53 2011 +1000
+
+ general tidy-ups in preparation for merge to master
+
+ commit 73bf71d5de0cb990178a1d2a31e0ea1717c214a4
+ Merge: fb499a4 b795ca6
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Mon Jan 17 08:47:40 2011 +1000
+
+ Merge branch 'master' into nvc0
+
+ commit fb499a4e9d95650dc89f4c1820b94d01344733f6
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Mon Dec 20 12:54:43 2010 +1000
+
+ nvc0: switch to "standard" RING macros
+
+ commit 64f0e1d0e9e29c5437ad4e52d01ccfb0b03a2ae9
+ Merge: eba7e17 c2092a4
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Mon Dec 20 11:58:42 2010 +1000
+
+ Merge branch 'master' into nvc0
+
+ Conflicts:
+ src/nv_dma.c
+
+ commit eba7e173a5006ff50b950d0e8b8154564471a9ce
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Fri Dec 17 11:04:40 2010 +1000
+
+ nvc0/xv: use mad in nv12 shader, rather than mul+add
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+ commit b025ceb40a5e94a3657f3c7f76044c49a1a05e8d
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Thu Dec 16 23:34:29 2010 +0100
+
+ nvc0: fix offset of 17bc buffer
+
+ I had messed it up in 5e4da3451c3c0f645f98fea7fb0ce2629b1bfd2f.
+
+ commit 6ff5a9a7f3411ef218f17fa481c583596ffde2cc
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Thu Dec 16 01:07:25 2010 +0100
+
+ nvc0/xv: bind textures for the FP, not the TEP
+
+ commit 5e4da3451c3c0f645f98fea7fb0ce2629b1bfd2f
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Thu Dec 16 01:02:58 2010 +0100
+
+ nvc0: switch to rnn headers
+
+ commit 0839041e79dbb0e629326d0f240220b33921db1a
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Wed Dec 15 16:42:41 2010 +1000
+
+ nvc0/exa: fix m2mf dfs
+
+ commit 88c1c43302331e1cb8b7035bfb4677a5e7da3090
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Mon Dec 13 12:00:23 2010 +1000
+
+ nvc0: add Xv implementation
+
+ commit ad5b4cfe388a102a0c93f7281cb4bba532b1796b
+ Merge: 1942a81 b6cb21b
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Wed Dec 15 14:57:04 2010 +1000
+
+ Merge branch 'master' into nvc0
+
+ commit 1942a81c0eb592972d4a3e8c46b80192ae8d1a59
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Thu Dec 9 12:48:27 2010 +1000
+
+ nvc0: call grobj_alloc for all used object classes
+
+ Though the hardware has no concept of object handles any more, the nouveau
+ DRM still uses this call to know what engines are in use.
+
+ commit 0c670a6d406fe0a57373fa9e03005be6f28ecc3e
+ Author: Ben Skeggs <bskeggs@redhat.com>
+ Date: Thu Dec 9 12:44:41 2010 +1000
+
+ nvc0: don't try and create DmaNotifier0
+
+ commit 5d3d20d908a50ad7742567d58969c7f12dd944f7
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Thu Dec 9 01:36:32 2010 +0100
+
+ nvc0: change tile_mode to contain 0xZYX instead of 0xZY
+
+ Warning: the kernel will not like that (EVO)
+
+ commit dd7fd8263e0e9f92412fb20086e4c8acf8cab099
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Thu Dec 9 00:29:58 2010 +0100
+
+ exa: don't fall back to nv04 m2mf if nvc0 m2mf fails
+
+ commit b4cf5a8f2276392945c2530f0d6fe96b5ab4b5da
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Thu Dec 9 00:07:59 2010 +0100
+
+ nvc0/exa: remove noisy debug messages
+
+ commit 5419ef6d2cfabb7329982cb8dbdb5bbc8e973fe3
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Wed Dec 8 23:55:51 2010 +0100
+
+ nvc0/accel: remove unneeded scratch method 0x3420 init
+
+ It was intended be read by a MACRO method to get the address for
+ constants upload.
+
+ commit 178356391ff6831599eba257a5912079894641a1
+ Merge: 8573280 8bb8231
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Thu Dec 9 01:31:40 2010 +0100
+
+ Merge remote branch 'origin/master' into nvc0
+
+ Conflicts:
+ src/drmmode_display.c
+ src/nouveau_exa.c
+ src/nv_driver.c
+ src/nv_type.h
+
+ commit 8573280871401e29f27fa24d0b7c6ac5e35b2cc1
+ Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
+ Date: Sat Jul 3 14:27:36 2010 +0200
+
+ nvc0: initial implementation
+
+ EXA should work, Xv not yet done.
+
+commit b795ca6e97fae9735843748585401098dae1c3e1
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Fri Jan 7 13:33:36 2011 +1000
+
+ nv50: fix pitch of linear scanout buffers
+
+ Un-breaks NoAccel on these chipsets.
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit dc89dac734167bcbc667b39ca6ee2043871a60bf
+Author: Xavier Chantry <chantry.xavier@gmail.com>
+Date: Sun Dec 19 23:17:34 2010 +0100
+
+ nv04/exa: kill useless WAIT_RING
+
+ Signed-off-by: Francisco Jerez <currojerez@riseup.net>
+
+commit b76b43928bf4dcf5ce3a4b58c7fefe780070c0d3
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Tue Dec 21 16:25:23 2010 +1000
+
+ add back generic include of nouveau_pushbuf.h
+
+ So places that FIRE_RING() still work.
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit c2092a458401377f421d9bdfe1d97ce580b99508
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon Dec 20 11:50:57 2010 +1000
+
+ include nv04_pushbuf.h for ring macros, rather than nouveau_pushbuf.h
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit aa2821a42706ac7b69703d1869e2d00a4ced9f4b
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon Dec 20 11:53:53 2010 +1000
+
+ kill NVSync(), it's rather useless
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 1fc564fe3494cf0abcc848d0e90bf2232f8fd272
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Thu Dec 16 09:49:09 2010 +1000
+
+ nv50/xv: use mad in nv12 shader, rather than mul+add
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit b6cb21b91f7d0409794a14ddbdd606728d4d49e3
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon Feb 8 12:51:47 2010 +1000
+
+ set canDoBGNoneRoot if building against new enough server
+
+commit 11510f9ce8c9eab15e7f6d5962b83fc0052c8619
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Tue Dec 14 15:39:01 2010 +1000
+
+ nv50/xv: implement brightness/contrast/saturation/hue controls
+
+ Adapted from the code in xf86-video-ati.
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+commit 214ea264cdb386520a1308a29f204e441f349cb1
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Tue Dec 14 14:42:24 2010 +1000
+
+ nv50/xv: kick csc parameters out into a constant buffer
+
+ These were previously inlined into the shader, which is simple, but makes
+ implementing brightness/contrast adjustments impossible.
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
commit 8bb8231236a6b877895663aeaa9cef731d67fe68
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Tue Nov 30 15:27:36 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index c6b3eca..4a737b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Sven Joachim <svenjoac@gmx.de> Sat, 05 Mar 2011 10:13:42 +0100
+
xserver-xorg-video-nouveau (1:0.0.16+git20101210+8bb8231-2+exp2) experimental; urgency=low
* Rebuild against Xserver 1.10 rc3.
commit 92db2bc192a074d4b7fc3e9c16e9aa62a8deaeb6
Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Thu Mar 3 22:17:23 2011 +0100
nvc0/accel: allow nvc1,nvc3,nvc4 in 3D engine init and use 9097
diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c
index aef8305..c37b30c 100644
--- a/src/nvc0_accel.c
+++ b/src/nvc0_accel.c
@@ -92,6 +92,9 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn)
switch (pNv->dev->chipset) {
case 0xc0:
+ case 0xc1:
+ case 0xc3:
+ case 0xc4:
tclClass = 0x9097;
break;
default:
commit ace98a492353e6de712f4f717e6d3f562e3591f0
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Tue Mar 1 13:54:38 2011 +1000
dri2: return an error rather than crashing if we can't allocate a buffer
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index d5afa8a..1a68ed3 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -29,6 +29,7 @@ nouveau_dri2_create_buffer(DrawablePtr pDraw, unsigned int attachment,
ScreenPtr pScreen = pDraw->pScreen;
NVPtr pNv = NVPTR(xf86Screens[pScreen->myNum]);
struct nouveau_dri2_buffer *nvbuf;
+ struct nouveau_pixmap *nvpix;
PixmapPtr ppix;
nvbuf = calloc(1, sizeof(*nvbuf));
@@ -70,7 +71,14 @@ nouveau_dri2_create_buffer(DrawablePtr pDraw, unsigned int attachment,
nvbuf->base.flags = 0;
nvbuf->ppix = ppix;
- nouveau_bo_handle_get(nouveau_pixmap(ppix)->bo, &nvbuf->base.name);
+ nvpix = nouveau_pixmap(ppix);
+ if (!nvpix || !nvpix->bo ||
+ nouveau_bo_handle_get(nvpix->bo, &nvbuf->base.name)) {
+ pScreen->DestroyPixmap(nvbuf->ppix);
+ free(nvbuf);
+ return NULL;
+ }
+
return &nvbuf->base;
}
commit bc5dec2ca7ca7edc340a99bd73946e228117dfd8
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Thu Feb 24 15:15:00 2011 +1000
dri2: disable page flipping if any crtc is rotated
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index 45add0f..d5afa8a 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -134,7 +134,16 @@ static Bool
can_exchange(DrawablePtr draw, PixmapPtr dst_pix, PixmapPtr src_pix)
{
ScrnInfoPtr scrn = xf86Screens[draw->pScreen->myNum];
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
NVPtr pNv = NVPTR(scrn);
+ int i;
+
+ for (i = 0; i < xf86_config->num_crtc; i++) {
+ xf86CrtcPtr crtc = xf86_config->crtc[i];
+ if (crtc->enabled && crtc->rotatedData)
+ return FALSE;
+
+ }
return (!nouveau_exa_pixmap_is_onscreen(dst_pix) ||
(DRI2CanFlip(draw) && pNv->has_pageflip)) &&
commit c123618470b5ff32c6377a4cae0f148d4a518a5d
Author: Francesco Marella <francesco.marella@gmail.com>
Date: Thu Feb 17 03:48:16 2011 +0100
Fix gcc 4.6.0 set but unused variable warnings
Signed-off-by: Francesco Marella <fmarl@paranoici.org>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d14dd80..43a2672 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1158,7 +1158,6 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
{
- xf86CrtcConfigPtr xf86_config;
drmmode_ptr drmmode;
int i;
@@ -1167,7 +1166,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
drmmode->fb_id = 0;
xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
- xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
drmmode->cpp = cpp;
drmmode->mode_res = drmModeGetResources(drmmode->fd);
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 7497d7c..f503c39 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -601,7 +601,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
MessageType from;
const char *reason;
uint64_t v;
- int ret, i;
+ int ret;
if (flags & PROBE_DETECT) {
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
@@ -609,7 +609,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
if (!pEnt)
return FALSE;
- i = pEnt->index;
free(pEnt);
return TRUE;
commit 3531b2aa13e9c78288d96fe5e1492f0b6e899b00
Author: Francesco Marella <francesco.marella@gmail.com>
Date: Thu Feb 17 03:47:46 2011 +0100
Page flipping man page update
Signed-off-by: Francesco Marella <fmarl@paranoici.org>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/man/nouveau.man b/man/nouveau.man
index 39de690..dd9d938 100644
--- a/man/nouveau.man
+++ b/man/nouveau.man
@@ -90,6 +90,9 @@ For example:
.B
Option \*qZaphodHeads\*q \*qLVDS,VGA-0\*q
will assign xrandr outputs LVDS and VGA-0 to this instance of the driver.
+.TP
+.BI "Option \*qPageFlip\*q \*q" boolean \*q
+Enable DRI2 page flipping. Default: on.
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
commit 85a706df6f7986158c964e3afd0aa8e352ff5cea
Author: Francesco Marella <francesco.marella@gmail.com>
Date: Thu Feb 17 03:47:08 2011 +0100
Update configure.ac with autoupdate
Signed-off-by: Francesco Marella <fmarl@paranoici.org>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/configure.ac b/configure.ac
index 676c2a4..6a143dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,11 +20,11 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-nouveau],
- 0.0.16,
+ [0.0.16],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-nouveau)
+ [xf86-video-nouveau])
AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION],
[$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]*\)\.[[0-9]]*\.[[0-9]]*/\1/')],
@@ -40,7 +40,7 @@ AC_DEFINE_UNQUOTED([NV_DRIVER_DATE],
[Driver date])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -49,13 +49,13 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# Checks for programs.
AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT
AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
@@ -113,8 +113,9 @@ AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
src/Makefile
man/Makefile
])
+AC_OUTPUT
commit 42c16ff33dcca6cd9bae62fe0d71a40452e03581
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Wed Feb 16 13:51:54 2011 +1000
nv50: attempt to allocate compressed Z buffers
This should automagically fallback to the non-compressed version on kernels
that don't support compression.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c
index ac4f628..735f47f 100644
--- a/src/nv_accel_common.c
+++ b/src/nv_accel_common.c
@@ -86,7 +86,7 @@ nouveau_allocate_surface(ScrnInfoPtr scrn, int width, int height, int bpp,
tile_mode = 0;
if (usage_hint & NOUVEAU_CREATE_PIXMAP_ZETA)
- tile_flags = 0x2800;
+ tile_flags = 0x22800;
else if (usage_hint & NOUVEAU_CREATE_PIXMAP_SCANOUT)
tile_flags = (bpp == 16 ? 0x7000 : 0x7a00);
else
commit 46acb7e095e9c0d55b90070b77c64679fcfb9d4e
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sun Feb 13 20:46:42 2011 +0100
fix drmSetMaster error reporting
On error, drmSetMaster returns -1 and sets errno.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 523cab8..7497d7c 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -334,7 +334,7 @@ NVEnterVT(int scrnIndex, int flags)
ret = drmSetMaster(nouveau_device(pNv->dev)->fd);
if (ret)
- ErrorF("Unable to get master: %d\n", ret);
+ ErrorF("Unable to get master: %s\n", strerror(errno));
Reply to: