ChangeLog | 911 +++++++++++++--- configure.ac | 9 debian/changelog | 54 debian/control | 6 debian/libdrm-intel1.symbols | 1 debian/patches/02_libdrm_nouveau_update.patch | 160 -- debian/patches/series | 1 debian/rules | 8 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs.sh | 66 - libdrm/intel/intel_bufmgr.h | 1 libdrm/intel/intel_bufmgr_fake.c | 19 libdrm/intel/intel_bufmgr_gem.c | 72 + libdrm/nouveau/Makefile.am | 4 libdrm/nouveau/nouveau_bo.c | 25 libdrm/nouveau/nouveau_device.c | 18 libdrm/nouveau/nouveau_drmif.h | 3 libdrm/nouveau/nouveau_fence.c | 16 libdrm/nouveau/nouveau_private.h | 2 shared-core/i915_reg.h | 1422 ++++++++++++++++++++++++++ tests/Makefile.am | 47 tests/drmtest.c | 117 +- tests/drmtest.h | 3 tests/gem_basic.c | 6 tests/gem_flink.c | 6 tests/gem_mmap.c | 6 tests/gem_readwrite.c | 6 tests/getversion.c | 3 tests/setversion.c | 5 tests/updatedraw.c | 5 30 files changed, 2532 insertions(+), 502 deletions(-)
New commits: commit 4f61f406a484ae6741db2d2fa9d98ca0974cb1f8 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Tue May 12 22:48:11 2009 +0300 Release 2.4.9-2ubuntu1. diff --git a/debian/changelog b/debian/changelog index db0398c..c0498e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +libdrm (2.4.9-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - control: + + libdrm-intel1 Replaces libdrm2 (<= 2.4.1-0ubuntu5) + + libdrm-dev depends on linux-libc-dev => 2.6.28-5.15 on + [amd64 armel i386] only, and >= 2.6.28-2.4 on lpia + + Remove scary 'built from DRM snapshot' warning from long description of + libdrm-intel1{,-dbg} + + libdrm-dev depends on libdrm-nouveau1 + + add libdrm-nouveau1{,-dbg} source packages + - rules: + + Add libdrm-nouveau1 and libdrm-nouveau1-dbg package + + Enable nouveau experimental api + - copyright: + + Update to include new files from add_libdrm-nouveau.patch + - libdrm-dev.install: Also install r300_reg.h, via_3d_reg.h, + xgi_drm.h, the nouveau headers, and other headers not provided by + the kernel. + + -- Bryce Harrington <br...@ubuntu.com> Mon, 11 May 2009 18:56:10 -0700 + libdrm (2.4.9-2) unstable; urgency=low * Ship all drm headers on kfreebsd, again. diff --git a/debian/patches/02_libdrm_nouveau_update.patch b/debian/patches/02_libdrm_nouveau_update.patch deleted file mode 100644 index 3fef730..0000000 --- a/debian/patches/02_libdrm_nouveau_update.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff --git a/libdrm/nouveau/Makefile.am b/libdrm/nouveau/Makefile.am -index 80fb780..688eeca 100644 ---- a/libdrm/nouveau/Makefile.am -+++ b/libdrm/nouveau/Makefile.am -@@ -19,7 +19,9 @@ libdrm_nouveau_la_SOURCES = \ - nouveau_bo.c \ - nouveau_resource.c \ - nouveau_dma.c \ -- nouveau_fence.c -+ nouveau_fence.c \ -+ nouveau_dma.h \ -+ nouveau_private.h - - libdrm_nouveaucommonincludedir = ${includedir}/nouveau - libdrm_nouveaucommoninclude_HEADERS = \ -diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c -index 6b9877f..023c6be 100644 ---- a/libdrm/nouveau/nouveau_bo.c -+++ b/libdrm/nouveau/nouveau_bo.c -@@ -347,24 +347,25 @@ nouveau_bo_handle_get(struct nouveau_bo *bo, uint32_t *handle) - if (!bo || !handle) - return -EINVAL; - -- if (!nvdev->mm_enabled) -- return -ENODEV; -- - if (!nvbo->global_handle) { - struct drm_gem_flink req; - - ret = nouveau_bo_kalloc(nvbo, NULL); - if (ret) - return ret; -- -- req.handle = nvbo->handle; -- ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req); -- if (ret) { -- nouveau_bo_kfree(nvbo); -- return ret; -+ -+ if (nvdev->mm_enabled) { -+ req.handle = nvbo->handle; -+ ret = ioctl(nvdev->fd, DRM_IOCTL_GEM_FLINK, &req); -+ if (ret) { -+ nouveau_bo_kfree(nvbo); -+ return ret; -+ } -+ -+ nvbo->global_handle = req.name; -+ } else { -+ nvbo->global_handle = nvbo->offset; - } -- -- nvbo->global_handle = req.name; - } - - *handle = nvbo->global_handle; -@@ -412,6 +413,8 @@ nouveau_bo_del_cb(void *priv) - { - struct nouveau_bo_priv *nvbo = priv; - -+ nouveau_fence_ref(NULL, &nvbo->fence); -+ nouveau_fence_ref(NULL, &nvbo->wr_fence); - nouveau_bo_kfree(nvbo); - free(nvbo); - } -diff --git a/libdrm/nouveau/nouveau_device.c b/libdrm/nouveau/nouveau_device.c -index b5ac854..a61abb4 100644 ---- a/libdrm/nouveau/nouveau_device.c -+++ b/libdrm/nouveau/nouveau_device.c -@@ -76,6 +76,22 @@ nouveau_device_open_existing(struct nouveau_device **dev, int close, - } - nvdev->base.vm_vram_base = value; - -+ ret = nouveau_device_get_param(&nvdev->base, -+ NOUVEAU_GETPARAM_FB_SIZE, &value); -+ if (ret) { -+ nouveau_device_close((void *)&nvdev); -+ return ret; -+ } -+ nvdev->vram_aper_size = value; -+ -+ ret = nouveau_device_get_param(&nvdev->base, -+ NOUVEAU_GETPARAM_AGP_SIZE, &value); -+ if (ret) { -+ nouveau_device_close((void *)&nvdev); -+ return ret; -+ } -+ nvdev->gart_aper_size = value; -+ - ret = nouveau_bo_init(&nvdev->base); - if (ret) { - nouveau_device_close((void *)&nvdev); -@@ -128,7 +144,7 @@ nouveau_device_close(struct nouveau_device **dev) - { - struct nouveau_device_priv *nvdev; - -- if (dev || !*dev) -+ if (!dev || !*dev) - return; - nvdev = nouveau_device(*dev); - *dev = NULL; -diff --git a/libdrm/nouveau/nouveau_drmif.h b/libdrm/nouveau/nouveau_drmif.h -index c21fba2..3791325 100644 ---- a/libdrm/nouveau/nouveau_drmif.h -+++ b/libdrm/nouveau/nouveau_drmif.h -@@ -37,6 +37,9 @@ struct nouveau_device_priv { - int needs_close; - - int mm_enabled; -+/*XXX: move to nouveau_device when interface gets bumped */ -+ uint64_t vram_aper_size; -+ uint64_t gart_aper_size; - }; - #define nouveau_device(n) ((struct nouveau_device_priv *)(n)) - -diff --git a/libdrm/nouveau/nouveau_fence.c b/libdrm/nouveau/nouveau_fence.c -index e31fc89..3346616 100644 ---- a/libdrm/nouveau/nouveau_fence.c -+++ b/libdrm/nouveau/nouveau_fence.c -@@ -96,22 +96,16 @@ nouveau_fence_new(struct nouveau_channel *chan, struct nouveau_fence **fence) - int - nouveau_fence_ref(struct nouveau_fence *ref, struct nouveau_fence **fence) - { -- struct nouveau_fence_priv *nvfence; -- - if (!fence) - return -EINVAL; - -- if (*fence) { -- nouveau_fence_del(fence); -- *fence = NULL; -- } -+ if (ref) -+ nouveau_fence(ref)->refcount++; - -- if (ref) { -- nvfence = nouveau_fence(ref); -- nvfence->refcount++; -- *fence = &nvfence->base; -- } -+ if (*fence) -+ nouveau_fence_del(fence); - -+ *fence = ref; - return 0; - } - -diff --git a/libdrm/nouveau/nouveau_private.h b/libdrm/nouveau/nouveau_private.h -index 9dc1b44..32a9052 100644 ---- a/libdrm/nouveau/nouveau_private.h -+++ b/libdrm/nouveau/nouveau_private.h -@@ -173,7 +173,7 @@ struct nouveau_bo_priv { - - /* Kernel object */ - uint32_t global_handle; -- unsigned handle; -+ drm_handle_t handle; - void *map; - - /* Last known information from kernel on buffer status */ diff --git a/debian/patches/series b/debian/patches/series index dd92619..8ca2297 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01_default_perms.diff -02_libdrm_nouveau_update.patch commit f7f9e2c21dfda6aab07126fe38b107e129b40fba Author: Julien Cristau <jcris...@debian.org> Date: Sun May 3 18:55:45 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 74c035e..e21bec9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdrm (2.4.9-2) UNRELEASED; urgency=low +libdrm (2.4.9-2) unstable; urgency=low * Ship all drm headers on kfreebsd, again. * Move -dbg packages to new debug section. - -- Julien Cristau <jcris...@debian.org> Sun, 19 Apr 2009 00:12:43 +0200 + -- Julien Cristau <jcris...@debian.org> Sun, 03 May 2009 18:55:42 +0200 libdrm (2.4.9-1) unstable; urgency=low commit 3349b34aeaa741c56ec2fc4d8478c3a483dd6361 Author: Julien Cristau <jcris...@debian.org> Date: Sun May 3 18:55:40 2009 +0200 Move -dbg packages to new debug section. diff --git a/debian/changelog b/debian/changelog index d1ae242..74c035e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdrm (2.4.9-2) UNRELEASED; urgency=low * Ship all drm headers on kfreebsd, again. + * Move -dbg packages to new debug section. -- Julien Cristau <jcris...@debian.org> Sun, 19 Apr 2009 00:12:43 +0200 diff --git a/debian/control b/debian/control index b353b9f..27c095f 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Description: Userspace interface to kernel DRM services -- runtime This package provides the runtime environment for libdrm. Package: libdrm2-dbg -Section: libdevel +Section: debug Priority: extra Architecture: any Depends: libdrm2 (= ${binary:Version}) @@ -63,7 +63,7 @@ Description: Userspace interface to intel-specific kernel DRM services -- runtim to be stable! Package: libdrm-intel1-dbg -Section: libdevel +Section: debug Priority: extra Architecture: any Depends: libdrm-intel1 (= ${binary:Version}), ${misc:Depends} commit a6f7f1d301b603fe58abaddea866d4b32282f683 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 19 00:14:22 2009 +0200 Ship all drm headers on kfreebsd, again. diff --git a/debian/changelog b/debian/changelog index 923b522..d1ae242 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdrm (2.4.9-2) UNRELEASED; urgency=low + + * Ship all drm headers on kfreebsd, again. + + -- Julien Cristau <jcris...@debian.org> Sun, 19 Apr 2009 00:12:43 +0200 + libdrm (2.4.9-1) unstable; urgency=low [ Brice Goglin ] diff --git a/debian/rules b/debian/rules index f92c2d8..523b24d 100755 --- a/debian/rules +++ b/debian/rules @@ -79,10 +79,12 @@ install: build dh_installdirs cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp +ifeq (linux, $(DEB_HOST_ARCH_OS)) # remove files provided by linux-libc-dev for file in drm_mode.h drm_sarea.h drm.h i915_drm.h mga_drm.h r128_drm.h radeon_drm.h savage_drm.h sis_drm.h via_drm.h; do \ rm -f debian/tmp/usr/include/drm/$$file; \ done +endif # Build architecture-independent files here. binary-indep: build install commit 0b988eea4e2e8598343e93caaaa6294194a45487 Author: Brice Goglin <bgog...@debian.org> Date: Wed Apr 15 14:58:14 2009 +0200 Fix the changelog and reupload 2.4.9-1 diff --git a/debian/changelog b/debian/changelog index 9d4c77d..923b522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ libdrm (2.4.9-1) unstable; urgency=low - [ Brice Goglin�] + [ Brice Goglin ] * New upstream release. + Remove buggy symlinks for the upstream tarball. * Add myself to Uploaders. - [ Julien Cristau�] + [ Julien Cristau ] * Make the linux-libc-dev dependency linux-only (closes: #521253). Thanks, Petr Salinger! commit 802c9a1e5cb3130a5d5183146b686e000d3c38f6 Author: Brice Goglin <bgog...@debian.org> Date: Wed Apr 15 15:01:41 2009 +0200 Bump dh_makeshlibs invocation to libdrm-intel1 >= 2.4.9 diff --git a/debian/rules b/debian/rules index 37b7210..f92c2d8 100755 --- a/debian/rules +++ b/debian/rules @@ -103,7 +103,7 @@ binary-arch: build install dh_compress dh_fixperms dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.3)' -- -c4 - dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.5)' -- -c4 + dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.9)' -- -c4 dh_installdeb dh_shlibdeps dh_gencontrol commit 1ab2fa756dca9e03faf1c6b8a295a4e9d93d7aa0 Author: Brice Goglin <bgog...@debian.org> Date: Sat Apr 11 22:06:32 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 510e585..9d4c77d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,15 @@ -libdrm (2.4.9-1) UNRELEASED; urgency=low +libdrm (2.4.9-1) unstable; urgency=low [ Brice Goglin�] * New upstream release. + Remove buggy symlinks for the upstream tarball. + * Add myself to Uploaders. [ Julien Cristau�] * Make the linux-libc-dev dependency linux-only (closes: #521253). Thanks, Petr Salinger! - -- Brice Goglin <bgog...@debian.org> Sat, 11 Apr 2009 23:11:50 +0200 + -- Brice Goglin <bgog...@debian.org> Sat, 11 Apr 2009 23:12:49 +0200 libdrm (2.4.5-2) unstable; urgency=low diff --git a/debian/control b/debian/control index c199c61..b353b9f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libdrm Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: Thierry Reding <thie...@gilfi.de>, Julien Cristau <jcris...@debian.org>, David Nusinow <dnusi...@debian.org> +Uploaders: Thierry Reding <thie...@gilfi.de>, Julien Cristau <jcris...@debian.org>, David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> Build-Depends: debhelper (>= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt (>= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev Standards-Version: 3.7.3 Section: libs commit 42b85f201d5e5f2c73688a0d28e8d01e1b4faf27 Author: Brice Goglin <bgog...@debian.org> Date: Sat Apr 11 22:05:02 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 64deb58..2320e48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,596 @@ +commit 07646002c6835537c6ae44ef9b3f8480762279b8 +Author: Jesse Barnes <jbar...@virtuousgeek.org> +Date: Fri Apr 10 15:34:24 2009 -0700 + + Bump version to 2.4.9 + + Who needs 2.4.8 anyway? + +commit 4d5e82e7d3cf9f94c1c74bd5067e3ea1fb9d0981 +Author: Jesse Barnes <jbar...@virtuousgeek.org> +Date: Fri Apr 10 15:24:41 2009 -0700 + + Bump version to 2.4.8 + +commit 3637dcc66d707aa9ababf0b12cd4a299559522f5 +Author: Jesse Barnes <jbar...@virtuousgeek.org> +Date: Fri Apr 10 15:24:10 2009 -0700 + + Revert "libdrm: speed up connector & mode fetching" + + This reverts commit cd5c66c659168cbe2e3229ebf8be79f764ed0ee1. It broke too + many kernel assumptions about the double ioctl (connector status, mode + fetching, etc.) + +commit fef29358bb407f35b90e8c6ee913e4979786cfd5 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Thu Apr 9 15:19:10 2009 -0400 + + Bump version to 2.4.7 + +commit ec9b7b320a724e49d61375b4ad53e2c88fa30f66 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Thu Apr 9 15:17:51 2009 -0400 + + test: Avoid recursive dependency in makefile + +commit a85e07b9031c819f3cdf54b66c90ac0c450e3e75 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Thu Apr 9 15:02:40 2009 -0400 + + test: Makefile.am grammar nazi + +commit 1faab66cfd1a854925da6ff7109aa614292dea90 +Author: Dave Airlie <airl...@linux.ie> +Date: Tue Apr 7 09:26:32 2009 +1000 + + drm: fix test makefile + + no idea if this is correct but it works so meh + +commit 751db3fe27d5e51925c28ceecadb828784d46028 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Mon Apr 6 17:22:10 2009 -0400 + + Skip tests that require root + + This lets us do make distcheck as non-root. + +commit 8a5c4d567fafffbda57cbe5e4ed8c419193cada5 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Mon Apr 6 17:18:17 2009 -0400 + + XFAIL auth and lock test cases + + They're writing to the read end of a pipe and failing. + +commit e9d6116e5bd30639d6333ef95462fe300f47ccd5 +Author: Kristian Høgsberg <k...@redhat.com> +Date: Mon Apr 6 17:13:01 2009 -0400 + + Use libudev in test case to only run gem tests for intel devices. + +commit 51d6346f9f3c425f49e57d185530c6bcaeb94f5e +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Mar 31 13:33:18 2009 -0500 + + Move drm_vblank_cleanup() after lastclose. + + This may prevent a possible panic on shutdown. + +commit cd5c66c659168cbe2e3229ebf8be79f764ed0ee1 +Author: Jesse Barnes <jbar...@virtuousgeek.org> +Date: Mon Mar 30 14:35:30 2009 -0700 + + libdrm: speed up connector & mode fetching + + This patch speeds up drmModeGetConnector by pre-allocating mode & + property info space before calling into the kernel. In many cases this + pre-allocation will be sufficient to hold the returned values (it's easy + enough to tweak if the common case becomes larger), which means we don't + have to make the second call, which saves a lot of time. + + Acked-by: Jakob Bornecrantz <wallbra...@gmail.com> + Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org> + +commit 93e65271601e6a1c7c90453f2f13157ae24b35c2 +Author: Stuart Bennett <stu...@freedesktop.org> +Date: Mon Mar 30 20:38:49 2009 +0100 + + nouveau: nForce 1/2 IGP memory sanity check from DDX + +commit 2ada85502242a3d5328b8f392d7843ef58a78780 +Author: Jesse Barnes <jbar...@virtuousgeek.org> +Date: Mon Mar 30 11:25:09 2009 -0700 + + libdrm: bump version to 2.4.6 + + This version includes GTT unmap support for the Intel bufmgr. + +commit e2d7dfb61ad7a97367f050150160c205614d152e +Author: Jesse Barnes <jbar...@virtuousgeek.org> +Date: Thu Mar 26 16:43:00 2009 -0700 + + libdrm/intel: support GTT maps correctly + + libdrm has some support for GTT mapping already, but there are bugs + with it (no surprise since it hasn't been used much). + + In fixing 20803, I found that sharing bo_gem->virtual was a bad idea, + since a previously mapped object might not end up getting GTT mapped, + leading to corruption. So this patch splits the fields according to + use, taking care to unmap both at free time (but preserving the map + caching). + + There's still a risk we might run out of mappings (there's a sysctl + tunable for max number of mappings per process, defaulted to 64k or so + it looks like) but at least GTT maps will work with these changes (and + some others for fixing PAT breakage in the kernel). + + Reviewed-by: Eric Anholt <e...@anholt.net> + Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org> + +commit c9cfeaa5542e08381a8144d0a5bd96036a19082f +Author: Stuart Bennett <stu...@freedesktop.org> +Date: Tue Mar 24 23:39:41 2009 +0000 + + nouveau: plug drm fifo ioremap leak (#14941) + +commit 03ca202fa56ad7711ad0f7527a1e537154093e8a +Author: Stuart Bennett <stu...@freedesktop.org> +Date: Tue Mar 24 23:26:30 2009 +0000 + + nouveau: add linux compat defines for PCI config access, use them for nvidia IGPs + +commit b71f3f114e6f0e94e15958c0aa12e804392f9df2 +Author: Stuart Bennett <stu...@freedesktop.org> +Date: Tue Mar 24 16:42:36 2009 +0000 + + nouveau: use PFB_CSTATUS naming from ddx (reg introduced with nv10) + + NV04 had a PFB_FIFO_DATA at the same address, which we don't use, so + remove it to reduce confusion + +commit d6ad0dba01a8246b9e7c96388f747c8ed9631ce4 +Author: Ben Skeggs <bske...@redhat.com> +Date: Wed Mar 25 08:10:12 2009 +1000 + + libdrm/nouveau: fix typo in nouveau_device_close() + +commit 98b0df3953f229fd5fb7484d2f566aeb0443c12f +Author: Ben Skeggs <bske...@redhat.com> +Date: Fri Mar 20 10:35:55 2009 +1000 + + libdrm/nouveau: ask the kernel for vram/gart aperture sizes + +commit bad16a6b22e06b0adf7663543e26caae9916444c +Author: Ben Skeggs <bske...@redhat.com> +Date: Fri Mar 20 10:32:47 2009 +1000 + + libdrm/nouveau: remove unneccesary null ptr checks + +commit c37fca4ef678667bcba9c45c6e0a59c8d174c7c5 +Author: Ben Skeggs <bske...@redhat.com> +Date: Fri Mar 20 10:24:40 2009 +1000 + + libdrm/nouveau: incr refcount on ref fence before decr on old fence + +commit 00d8e960ca665b7f0528438331f4d0ae77fbb4cc +Author: Maarten Maathuis <madman2...@gmail.com> +Date: Thu Mar 19 23:59:42 2009 +0100 + + libdrm/nouveau: unref fences when deleting bo + + - This was causing a significant memory leak. + +commit 6169e3a6012d55522fc8028a5674891a5a99d935 +Author: Ben Skeggs <bske...@redhat.com> +Date: Wed Mar 18 10:25:22 2009 +1000 + + libdrm/nouveau: implement bo_handle_get for !mm_enabled + + bo_handle_ref on !mm_enabled treats handle as an offset, make + bo_handle_get do the same rather than failing. + +commit 2e2e8575b1ed4703653a72ac2b60b75316c388d7 +Author: Robert Noland <rnol...@2hip.net> +Date: Sun Mar 15 13:52:58 2009 -0500 + + libdrm_nouveau: The handle that is passed to mmap needs to be drm_handle_t + + drm_handle_t is defined to be a u32 on linux and a u64 on everything + else. This addresses an issue on FreeBSD amd64 where the map offsets + may be greater than 32bits. When the handle is cast to 32bit, mmap + cannot match the requested map and causes X to crash. + + This should be a NOOP on linux since drm_handle_t is always 32bit. + + Signed-off-by: Robert Noland <rnol...@2hip.net> + +commit e8d34762558224bb76862425de965c47858f2afd +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 01:07:15 2009 -0500 + + FreeBSD: Set up the nouveau build infrastructure + + disabled by default until the rest of the patches are in. + +commit dec955d728505f060afccd047ff2b572cb4ba3c1 +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:41:23 2009 -0500 + + FreeBSD: Add support for matching solely on vedor id. + + This also adds that ability to set device name from VPD, but that + doesn't seem to be working... + +commit 44fec1a8e487a14e0221e32759cc16ce9fcd7b00 +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:35:18 2009 -0500 + + FreeBSD: Improve the debug output of drm_mmap(). + +commit f8f49aa6ec10e281b08279143f2bd999df118147 +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:30:28 2009 -0500 + + FreeBSD: Add list_for_each_prev() to our bank of compat functions. + +commit 6777c6bb8bb399e48500d742e80822808451010b +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:17:54 2009 -0500 + + FreeBSD: Don't set the PZERO flag to mtx_sleep. + + We also don't support anything old enough to need tsleep. + +commit 06e182d0259d1d2e775814fa070c6cce0ee233a8 +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:08:06 2009 -0500 + + FreeBSD: use flsl() instead of ffsl(). + + I noticed that we were computing drm_order differently than linux. + +commit 2ce00c6b674a51bdfaa3276b88d2015c59d4584e +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:07:31 2009 -0500 + + FreeBSD: Minor code cleanup. + +commit b0acc886069c0054da98059319a84eaf60114d32 +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:03:40 2009 -0500 + + FreeBSD: Increase MAX_PCI_RESOURCE + + We can have more than 3 BARs to access. + +commit f78040266bbddf6cf020fb957e3f92000c2bc69b +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 16 00:01:47 2009 -0500 + + FreeBSD: Cast map handles to vm_offset_t + + This prevents some warnings with nouveau. + +commit 82eac8060b98b425f29051bfd7830ba3622be7d8 +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 9 13:37:57 2009 -0500 + + FreeBSD: Fix the printing of maps on amd64/i386 to be consistent + +commit a3ba51bd041a448f3bb14678cebb0976e0fda47a +Author: Robert Noland <rnol...@2hip.net> +Date: Mon Mar 9 13:34:26 2009 -0500 + + FreeBSD: Fix up the flags for bus_dmamem here as well. + +commit af1afb3c381797e6bf0fb56abd4505094cb6c11e +Author: Robert Noland <rnol...@2hip.net> +Date: Sun Mar 8 22:55:01 2009 -0500 + + FreeBSD: Fix up the flags to bus_dmamem_* + + Allow it to sleep waiting for resources during the allocation stage. + Only use BUS_DMA_NOWAIT when loading the map. + +commit 2221e16703bf5bf813a98926b968bd5b28eb5d70 +Author: vehemens <vehem...@verizon.net> +Date: Sun Mar 8 18:17:15 2009 -0700 + + FreeBSD use kdev for kernel device name + + Signed-off-by: Robert Noland <rnol...@2hip.net> + +commit 391c92ae1799f0d1fddb2321c5713afc58575514 +Author: Ben Skeggs <bske...@redhat.com> +Date: Fri Mar 6 09:04:44 2009 +1000 + + drm/nouveau: make portion of vram as reserved for PRAMIN on all chipsets + + NV04 was completely busted. Push buffers were getting allocated at the + end of VRAM, overwriting PRAMIN. So, it turns out PRAMIN is in VRAM on + all chips. Question answered! + +commit 14503dafa79cfdea69d618f2c28dafb66765a8a0 +Author: Robert Noland <rnol...@2hip.net> +Date: Thu Mar 5 00:47:26 2009 -0600 + + FreeBSD: Rework DRM_[DEBUG,ERROR,INFO] macros a bit. + +commit 0a227a3361054f06da4bba34d02c8dadcd448e9a +Author: Robert Noland <rnol...@2hip.net> +Date: Thu Mar 5 00:46:32 2009 -0600 + + FreeBSD: Garbage collect entries from pcireg.h since we now include it. + +commit 222dc6582e7afad0cd397452a0c4bcea23efeb04 +Author: Robert Noland <rnol...@2hip.net> +Date: Thu Mar 5 00:44:56 2009 -0600 + + FreeBSD: We only want drm to ever attach to the primary pci device. + + Intel 855 chips present the same pci id for both heads. This prevents + us from attaching to the dummy second head. All other chips that I + am aware of either only present a single pci id, or different ids + for each head so that we only match on the correct head. + +commit 4a27f1c6384c3987dc25e0d2b65e4cf56af7769a +Author: Robert Noland <rnol...@2hip.net> +Date: Thu Mar 5 00:42:52 2009 -0600 + + FreeBSD: rework drm_scatter.c which allocates scatter / gather pages for use by + ati pci gart to use bus_dma to handle the allocations. This fixes + a garbled screen issue on at least some radeons (X1400 tested). + +commit e4b065ad9a0834fb646baf5a6051902d15716e5e +Author: Pekka Paalanen <p...@iki.fi> +Date: Tue Mar 3 22:42:51 2009 +0200 + + drm: drop Linux < 2.6.21 support + + This also means, that DRM_FULL_MM_COMPAT is always defined, + so it is dropped, too. + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit a6b28a86a6141259583c3699d1a2d9b26e366ba8 +Author: Pekka Paalanen <p...@iki.fi> +Date: Tue Mar 3 22:20:59 2009 +0200 + + drm, via: drop Linux < 2.6.20 support + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit f44c740dc7a05d651df7604baad8f667836d1b09 +Author: Pekka Paalanen <p...@iki.fi> +Date: Mon Mar 2 23:14:45 2009 +0200 + + drm: drop Linux < 2.6.19 support + + This also means dropping the DRM_ODD_MM_COMPAT case. + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit 081b2d6da22e08e1448285d647a35b17905512cf +Author: Pekka Paalanen <p...@iki.fi> +Date: Mon Mar 2 22:39:32 2009 +0200 + + drm: drop Linux < 2.6.18 support + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit 62f4344c98b72535df88a5a3d577c1df314e4f9b +Author: Pekka Paalanen <p...@iki.fi> +Date: Mon Mar 2 22:35:23 2009 +0200 + + drm: drop Linux < 2.6.16 support + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit 056ce26344197042cbef800436f16d3f8ba288c8 +Author: Pekka Paalanen <p...@iki.fi> +Date: Mon Mar 2 22:26:46 2009 +0200 + + drm: drop Linux < 2.6.15 support + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit b47de8d5a3dbfc669c7ba9c6cb66a7491c30b537 +Author: Pekka Paalanen <p...@iki.fi> +Date: Mon Mar 2 22:09:26 2009 +0200 + + drm: drop Linux < 2.6.12 support + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit 4c439ac4a7fa627691dfcd6a4be67cd95d8d33ee +Author: Pekka Paalanen <p...@iki.fi> +Date: Mon Mar 2 00:17:44 2009 +0200 + + drm: drop Linux < 2.6.10 support + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit 4bdddf57155a774318ed3739ede9511f074d394e +Author: Pekka Paalanen <p...@iki.fi> +Date: Mon Mar 2 00:13:00 2009 +0200 + + drm: drop Linux <= 2.6.8 support + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit d3f25ccca882f91071a0d68bb4b75ff871f0cc04 +Author: Pekka Paalanen <p...@iki.fi> +Date: Sun Mar 1 23:53:02 2009 +0200 + + drm: drm_bo_mmap_locked() is static. + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit a6dd0afa87558a670f970e61b023f45a396539eb +Author: Pekka Paalanen <p...@iki.fi> +Date: Sat Feb 28 17:45:02 2009 +0200 + + drm, ati: fix printf format warnings + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit 9e8591dbdbd99ec1cc4922d61ec4cc54ef42f0ac +Author: Pekka Paalanen <p...@iki.fi> +Date: Sat Feb 28 16:09:56 2009 +0200 + + drm: build fix for Linux drm_vblank_cleanup() + + The commit 957b10695b619d6ed2f1098b00502395d9a3c149, "Move vblank_init + to driver load time." forgot to add the function declaration in + linux-core/drmP.h. + + Signed-off-by: Pekka Paalanen <p...@iki.fi> + +commit ad64ff30d0e85486bba8fb6f0e2fcb1caa06fd5c +Author: Robert Noland <rnol...@2hip.net> +Date: Fri Feb 27 17:52:08 2009 -0600 + + FreeBSD: Introduce a kernel tuneable to disable msi at boot time. + +commit 957b10695b619d6ed2f1098b00502395d9a3c149 +Author: Robert Noland <rnol...@2hip.net> +Date: Wed Feb 25 17:59:26 2009 -0600 + + Move vblank_init to driver load time. + +commit 7ce8d4c1fec618ac2578ea0ddb8915b1b41ab9cb +Author: Eric Anholt <e...@anholt.net> +Date: Fri Feb 27 13:46:31 2009 -0800 + + intel: Update reloc_tree_size of the first buffer when we count the tree size. + + This helps avoid the n^2 performance cost of counting tree size when we + get a lot of relocations into our batch buffer. rgb10text on keithp's laptop + went from 136k glyphs/sec to 234k glyphs/sec. + +commit ab582f64fd54565f66eba866972f0fe2c313f000 +Author: Robert Noland <rnol...@2hip.net> +Date: Thu Feb 26 23:51:57 2009 -0600 + + FreeBSD: Fix up some ioctl permissions issues missed many times over. + + This was somehow hit with r600 demo. + + Submitted by: Jung-uk Kim <j...@freebsd.org> + +commit 948af0bd9b9eade489599d7ec160d42706331779 +Author: Robert Noland <rnol...@2hip.net> +Date: Wed Feb 25 14:19:01 2009 -0600 + + i915: Backport jbarnes gm45 vblank counter patch. + +commit efa485b2cf2f1f46760a3d9297ba1a73a2dbcd05 +Author: Eric Anholt <e...@anholt.net> +Date: Tue Feb 24 21:36:56 2009 -0800 + + intel: Don't copy dirty data out when freeing a BO in the fake bufmgr. + +commit e96fc62e5339e3c8c8944dfe9f5163f769bccbd8 +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Feb 24 15:49:45 2009 -0600 + + FreeBSD: Drop the Giant lock. + +commit b9b8e8f3cc61a37cce2ae48957514ce6a4f30566 +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Feb 24 15:47:35 2009 -0600 + + FreeBSD: Turn on msi + + There is a blacklist for devices that advertise the capability, but + don't work properly. + +commit 153a0803db19cf8c0b4f532e0d0243747875e154 +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Feb 24 14:21:10 2009 -0600 + + FreeBSD: Add some vblank related debugging and replace DRM_WAIT_ON with a local instance. + +commit a44b4ca8203e366df5a2ed5fe3d78faea4cf7d81 +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Feb 24 14:00:21 2009 -0600 + + i915: A few whitespace cleanups. + +commit 04d94197e69ed7d3cad194e8579631849135b08c +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Feb 24 12:59:08 2009 -0600 + + linux: Add msi_enabled to the drm_device so the build should be happy. + +commit 68707804284438140413987849fee989b9fe4ba8 +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Feb 24 12:28:42 2009 -0600 + + radeon: Prepare radeon for msi support. + +commit d45bc6667c6f10cbb3832178e4a6a8cdd036b739 +Author: Robert Noland <rnol...@2hip.net> +Date: Tue Feb 24 02:00:42 2009 -0600 + + i915: This was part of a sync to the intel driver at some point + + -Remove the old TTM interface + -Move register definitions to i915_reg.h + -Rework the irq handler + +commit c3c21303e381310a0962ecc24af1797dccd9a99f +Author: Kristian Høgsberg <k...@redhat.com> +Date: Tue Feb 24 11:33:34 2009 -0500 + + nouveau: Dist nouvea_dma.h as well. + + Oops. Disting is hard. + +commit a71d3edd6c09a0141fae0893cbee21b71578d99d +Author: Kristian Høgsberg <k...@redhat.com> +Date: Tue Feb 24 11:19:41 2009 -0500 + + nouveau: Also dist nouveau_private.h. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org