mesa: Changes to 'debian-experimental'
debian/changelog | 5 +++++
debian/control | 2 +-
src/gallium/drivers/nouveau/nouveau_screen.c | 2 +-
src/mesa/drivers/dri/nouveau/nouveau_context.c | 2 +-
src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 3fee09166d0679fb7e8eafd626eea8cd2df9c554
Author: Sven Joachim <svenjoac@gmx.de>
Date: Tue Dec 14 15:51:21 2010 +0100
Require libdrm-dev >= 2.4.23 for building
Needed for the latest libdrm-nouveau API. Document the cherry-pick in
debian/changelog.
diff --git a/debian/changelog b/debian/changelog
index 55971ef..206f858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ mesa (7.9+repack-2) UNRELEASED; urgency=low
- Add libudev-dev to build-depends. This is required for the DRI2 EGL
driver to work with a drm display.
+ [ Sven Joachim ]
+ * Update for the latest libdrm-nouveau API:
+ - Cherry-pick commit c25fcf5a from Mesa master.
+ - Build-depend on libdrm-dev 2.4.23 or newer.
+
-- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 29 Nov 2010 08:58:35 +1100
mesa (7.9+repack-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index e2ad0c1..2755a58 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
- libdrm-dev (>= 2.4.21-2~) [!hurd-i386], libx11-dev, xutils-dev,
+ libdrm-dev (>= 2.4.23) [!hurd-i386], libx11-dev, xutils-dev,
x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev,
libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.15.6), libxfixes-dev,
libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1),
commit 1fb25ddea883e665cee3d6caa93915cab3c29e5a
Author: Francisco Jerez <currojerez@riseup.net>
Date: Tue Sep 28 22:51:28 2010 +0200
nouveau: Get larger push buffers.
Useful to amortize the command submission/reloc overhead (e.g. etracer
goes from 72 to 109 FPS on nv4b).
(cherry picked from commit c25fcf5aa5beccd7731706b8f85682170a2eca56)
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index ebb21a6..a9426df 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -236,7 +236,7 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
int ret;
ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
- &screen->channel);
+ 512*1024, &screen->channel);
if (ret)
return ret;
screen->device = dev;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 4a1534b..d5e455d 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -129,7 +129,7 @@ nouveau_context_init(GLcontext *ctx, struct nouveau_screen *screen,
/* Allocate a hardware channel. */
ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
- &nctx->hw.chan);
+ 512*1024, &nctx->hw.chan);
if (ret) {
nouveau_error("Error initializing the FIFO.\n");
return GL_FALSE;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
index e5858f8..e5c6cb5 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
@@ -32,7 +32,7 @@
/* Arbitrary pushbuf length we can assume we can get with a single
* WAIT_RING. */
-#define PUSHBUF_DWORDS 2048
+#define PUSHBUF_DWORDS 65536
/* Functions to set up struct nouveau_array_state from something like
* a GL array or index buffer. */
Reply to: