libdrm: Changes to 'debian-experimental'
ChangeLog | 3363 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
debian/changelog | 4
debian/control | 2
debian/rules | 6
4 files changed, 3363 insertions(+), 12 deletions(-)
New commits:
commit 182fb9ca263d2e662d2c0a722d55678c55ba7aca
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 2 17:27:05 2008 +0100
Restrict the libdrm-dev dep on libdrm-intel1 to x86
diff --git a/debian/changelog b/debian/changelog
index 83d5649..9246eba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ libdrm (2.4.1-1) UNRELEASED; urgency=low
* Build-depend on pkg-config and libpthread-stubs0-dev (closes: #502078).
Thanks, Frank Lichtenheld!
* Don't mention *.la in libdrm-dev.install.
- * Make libdrm-dev depend on libdrm-intel1.
+ * Make libdrm-dev depend on libdrm-intel1 on x86.
* On Linux, let udev create the device files.
-- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 27 Nov 2008 09:33:05 +0200
diff --git a/debian/control b/debian/control
index 38fcf72..7f8d86e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
Package: libdrm-dev
Section: libdevel
Architecture: any
-Depends: libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version})
+Depends: libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386]
Description: Userspace interface to kernel DRM services -- development files
This library implements the userspace interface to the kernel DRM
services. DRM stands for "Direct Rendering Manager", which is the
commit ca733ec7775279bb20b98c071ff1e8549549a4ab
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 19 17:48:17 2008 +0200
On Linux, let udev create the device files.
diff --git a/debian/changelog b/debian/changelog
index 99b1df1..83d5649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
libdrm (2.4.1-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release. (closes: #505740)
* debian/rules:
-Run autoreconf at build time, build-depend on automake and libtool.
@@ -13,6 +14,7 @@ libdrm (2.4.1-1) UNRELEASED; urgency=low
Thanks, Frank Lichtenheld!
* Don't mention *.la in libdrm-dev.install.
* Make libdrm-dev depend on libdrm-intel1.
+ * On Linux, let udev create the device files.
-- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 27 Nov 2008 09:33:05 +0200
diff --git a/debian/rules b/debian/rules
index b59865b..783093a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,12 +15,18 @@ include debian/xsfbs/xsfbs.mk
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+ifeq (linux, $(DEB_HOST_ARCH_OS))
+ confflags += --enable-udev
+else
+ confflags += --disable-udev
+endif
CFLAGS = -Wall -g
commit ea8b9a8aac129ba28b2a966102b84ade351d728a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 19 17:19:05 2008 +0200
Update upstream changelog
diff --git a/ChangeLog b/ChangeLog
index 17934b7..cefcb74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,2612 @@
-commit 409d6818eba8a2e2938e0f9281c9318928ba5a35
+commit 00847dabe0fa5ccf796658f486e8f6f7a77e043b
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Oct 30 11:36:46 2008 -0700
+
+ libdrm 2.4.1.
+
+commit 4b9826408f65976a1a13387beda748b65e03ec52
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Oct 30 09:33:07 2008 -0700
+
+ intel: Rename dri_ and intel_ symbols to drm_intel_.
+
+ I wanted to avoid doing this, as it's a bunch of churn, but there was a
+ conflict between the dri_ symbols in libdrm and the symbols that were in
+ Mesa in 7.2, which broke Mesa 7.2 AIGLX when the 2D driver had loaded new
+ libdrm symbols. The new naming was recommended by cworth for giving the
+ code a unique prefix identifying where the code lives.
+
+ Additionally, take the opportunity to fix up two API mistakes: emit_reloc's
+ arguments were in a nonsensical order, and set_tiling lacked the stride
+ argument that the kernel will want to use soon. API compatibility with
+ released code is maintained using #defines.
+
+commit 0e867312323fa51af324228b98bff4f49a813481
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Oct 21 00:10:54 2008 -0700
+
+ intel: Add dri_bufmgr_check_aperture support for bufmgr_gem.
+
+ This relies on a new kernel ioctl to get the available aperture size.
+
+ In order to provide reasonable performance from dri_bufmgr_check_aperture, we
+ now require that once a buffer has been used as the target of a relocation,
+ it gets no further relocations added to it. This cuts the cost of
+ check_aperture from 10% to 1% in the 3D driver with no code changes, but
+ slightly complicates our plans for the 2D driver.
+
+commit e47ab7a5081e178bad385ce2e75b01474ea7aa4c
+Author: Ben Skeggs <skeggsb@gmail.com>
+Date: Tue Oct 28 12:00:08 2008 +1100
+
+ nv50: symlink nv50_grctx.h to linux-core...
+
+commit 48b73904b485d679df879522719e4451fdb96ab6
+Author: Ben Skeggs <skeggsb@gmail.com>
+Date: Tue Oct 28 11:38:30 2008 +1100
+
+ nv50: move context-related tables a separate header file
+
+ This turns the various nvXX_graph_init_ctxvals() methods into tables,
+ and speeds up compliation of nv50_graph.c quite a bit. This has bothered
+ me for a while, but others are complaining now so it's time to fix it :)
+
+commit 89ef1b5483bb234278fe40e193643fc9777f50d4
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Mon Oct 27 21:21:15 2008 +0200
+
+ drm: missing init_mm symbol, compatibility fix
+
+ The drm_compat.c version of kmap_atomic_prot_pfn() uses the macro
+ pgd_offset_k(), which references the symbol init_mm.
+ Starting in 2.6.25, init_mm is no longer exported by default.
+
+ The only user of kmap_atomic_prot_pfn() is i915, so this should
+ not hurt anyone, and it allows people to load drm.ko.
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit 145d2d610b90b6129bbbebd1e1f8c71f9147cbde
+Author: Robert Noland <rnoland@2hip.net>
+Date: Mon Oct 27 14:39:05 2008 -0400
+
+ i915: Since FreeBSD doesn't have gem support yet, don't advertise it.
+
+ This allows us to not crash X when using newer Intel ddx drivers.
+
+commit e1372f67274baa44419e000f5d3d6b2e81be2b51
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date: Mon Oct 27 13:18:07 2008 -0400
+
+ radeon: fix error in busmaster enable logic
+
+ - logic was wrong. rs400/rs480 should clear the RADEON_BUS_MASTER_DIS bit
+ - should fix kernel bug 11798
+
+commit 848f00d77381d8b442c096476302796f8fe122fa
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date: Mon Oct 27 12:59:39 2008 -0400
+
+ radeon: fix some fallout from the busmaster disable cleanup
+
+ rs400 is just like rs480. I mixed up the internal
+ chipset names for rs600 and rs400.
+
+commit 1d930fc75b99a89fc77d35d8f95f2877cfd5d7f0
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Sat Oct 25 12:11:44 2008 -0400
+
+ drm/i915: fix ioremap of a user address for non-root (CVE-2008-3831)
+
+ Olaf Kirch noticed that the i915_set_status_page() function of the i915
+ kernel driver calls ioremap with an address offset that is supplied by
+ userspace via ioctl. The function zeroes the mapped memory via memset
+ and tells the hardware about the address. Turns out that access to that
+ ioctl is not restricted to root so users could probably exploit that to
+ do nasty things. We haven't tried to write actual exploit code though.
+
+ It only affects the Intel G33 series and newer.
+
+commit b7d54b1dba8eba24da1b9cdd2116a26b98365b81
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Fri Oct 24 16:35:00 2008 +0800
+
+ intel: Also total child_size of the target_bos. Partial fix #17964.
+
+commit 8256c347cc80db0371b40b34ee8a163908d50079
+Author: Robert Noland <rnoland@2hip.net>
+Date: Thu Oct 23 15:46:32 2008 -0400
+
+ [FreeBSD] We should use dev2unit() rather than minor()
+
+commit 7dbeb18777a4dc1e7eb3c6bc4da3e72456afc8fc
+Author: Robert Noland <rnoland@2hip.net>
+Date: Thu Oct 23 15:42:49 2008 -0400
+
+ [FreeBSD] This check isn't correct and causes at least mga to lockup.
+
+commit a59ea02ff839fa0801763a90beb8b232b933c746
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Oct 16 21:15:01 2008 -0700
+
+ intel: ioctl is not defined to return -errno
+
+ Don't count on ioctl returning -errno; use errno directly.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 769197c8f16eaf3c0a476a4459e535afd4a939cb
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Thu Oct 16 10:37:30 2008 +0800
+
+ intel: avoid deadlock in intel_bufmgr_fake.
+
+commit 458e2d5bc5f949d00cfcc9a3f9ce89f0c9f5628c
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Oct 14 13:33:38 2008 -0700
+
+ intel: Fix compile warning.
+
+commit 993383873c215ab11975d98b93f131a4e3ea7ce6
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Oct 14 13:18:11 2008 -0700
+
+ intel: Add interface for getting tiling mode of a bo.
+
+commit d9c2f65dd8e50736a33e97a55c257ef6843e1ce7
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Oct 14 01:25:57 2008 +0200
+
+ link libdrm_intel properly
+
+ libdrm_intel needs symbols from libdrm, so link against it.
+
+commit 3e03d781f7c41a88d5d5f895be9c443bf3592ef0
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Oct 13 13:41:10 2008 -0700
+
+ intel: Avoid pthread mutex recursion in bufmgr_fake.
+
+ Bug #18035. Fixes deadlock in glean texCube testcase.
+
+commit c6109df93bc062d3ec2ff2808babe826532d11b3
+Author: Dave Airlie <airlied@linux.ie>
+Date: Mon Oct 13 07:16:33 2008 +1000
+
+ libdrm: don't depend or link to libdrm_intel
+
+commit f5327aca0cbb1b602e4f954b8f361f2e1daaf20d
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Oct 10 18:23:11 2008 -0400
+
+ [FreeBSD] Plug memory leak in drm_rmdraw() and drm_drawable_free_all()
+
+commit cdd3e9fc562bd57e0272e4c4d1c0707776bd01a1
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Oct 10 13:06:22 2008 -0400
+
+ [FreeBSD] Rework all of the memory allocations
+
+ Allocate memory from different pools. This allows the OS to track memory
+ allocations for us, much like the linux memory debugging. This will ease
+ tracking down memory leaks since the OS can track the number of allocations
+ from each pool and help to point us in the right direction. Also replace
+ drm_alloc and friends with static __inline__ versions while we are here.
+
+commit 1150a42d4398b14c5db2f34a5beba613528df147
+Author: Robert Noland <rnoland@2hip.net>
+Date: Thu Oct 9 22:13:26 2008 -0400
+
+ [FreeBSD] Fix linux list compat list_for_each_safe()
+
+ linux_for_each_safe would not handle lists with a single entry.
+
+commit a8f73c214dc2accee12d84b85d37fb498ab3adad
+Author: Robert Noland <rnoland@2hip.net>
+Date: Thu Oct 9 22:11:55 2008 -0400
+
+ i915: Cleanup interrupt handling
+
+commit 94c88c151cecae48ce1f4f01acddfaaad4b437f3
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Oct 9 14:30:56 2008 -0700
+
+ Manage fences in user-mode bufmgr_fake to clean buffers
+
+ When using bufmgr_fake without DRM, the X server idles the ring whenever it
+ wants to wait for something to complete (brutal, but effective). In this
+ case, bufmgr_fake must treat the pending fence as having passed. However, it
+ wasn't recording the fences as it emitted them, nor cleaning buffers as they
+ passed.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3169d9639bd002b43e4064cea32e0d262076c1e0
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 12 23:22:26 2008 -0700
+
+ intel: Protect bufmgr objects with a pthread mutex.
+
+ We want to be able to use the bufmgr from multiple threads for GL, and thus
+ we need to protect the internal structures.
+
+ The pthread-stubs package is used so that programs not linked against
+ pthreads get weak symbols to stubs and don't eat most of the cost.
+
+commit 604759d4a78efcef0abdb40bfc215526cdcf1122
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Thu Oct 9 11:57:13 2008 +0800
+
+ intel: fix for write_domain and static BOs.
+
+ http://bugs.freedesktop.org/show_bug.cgi?id=17705
+
+commit 728d8e226f1bc12f50f710cc96bbb2a25f72ada3
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date: Mon Oct 6 12:12:49 2008 -0400
+
+ radeon: add comment to clarify bus mastering on PCIE chips
+
+commit 6f9dfa098fed73895f4ad32f9274ffaa163d3efb
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date: Mon Oct 6 12:01:11 2008 -0400
+
+ radeon: fix duplicate define in my last commit
+
+ That's what I get for committing at 3 AM.
+
+commit 8e5f5ed189fa28e08e45274c15f8ed41f627bc8b
+Author: Dave Airlie <airlied@linux.ie>
+Date: Tue Oct 7 04:47:54 2008 +1000
+
+ radeon: PCIE cards don't appear to have explicit bus master
+
+commit d0aff120521db3fa170ae55cc16a4935e813816d
+Author: Dave Airlie <airlied@linux.ie>
+Date: Wed Sep 17 03:00:02 2008 +1000
+
+ drm: add create gpu tree script
+
+commit 4b98f6d74ffb119174237d30356ed3e2724b27da
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date: Mon Oct 6 03:08:27 2008 -0400
+
+ radeon: fix bus master enabled bits on newer asics
+
+commit 5a36cce3499c48fe1bf137b26b2a5e8a383d0332
+Author: Mihail Zenkov <mihail.zenkov@gmail.com>
+Date: Mon Oct 6 00:49:15 2008 -0400
+
+ radeon: fix missing bit from rs740 patch
+
+ See bug 17908
+
+commit ce40261012d39e1096442ef48c45b305c8d69dbd
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date: Sat Oct 4 20:43:21 2008 -0400
+
+ radeon: Add support for HD2100 IGP (RS740)
+
+commit 60cf3a4db4ab8ee81aca104624e89caf5587419b
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Oct 3 14:11:20 2008 -0400
+
+ [FreeBSD] Don't explicitly bzero driver softc.
+
+ This is already handled for us.
+
+ Suggested by John Baldwin
+
+commit 9c0ce38df3d9026785155d06fc62bdd7acaf8bf0
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Oct 3 14:05:45 2008 -0400
+
+ [FreeBSD] Use M_WAITOK when allocating driver memory.
+
+ We don't explicitly check for error here and M_WAITOK will just put the
+ process to sleep waiting on resources to become available.
+
+ Suggested by John Baldwin
+
+commit 4c92abfa8d0b9f2ab14e6b915bdffd47fd2e2474
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Oct 3 13:56:50 2008 -0400
+
+ [FreeBSD] Do a bit of optimization on drm_order()
+
+commit 81952c7dd18d8fc4617fe4cb761fdf830de5244f
+Author: Robert Noland <rnoland@2hip.net>
+Date: Sat Sep 20 18:34:57 2008 -0400
+
+ Use devfs_get_cdevpriv in mmap as well.
+
+ d_mmap gets called twice and we are only able to associate the file_priv
+ during the first call. The second call will return EBADF and we need to
+ assume that the call was succesful. d_mmap will not tolerate having an
+ error returned for the second call.
+
+commit 073cb5ee1d12a7f1a18b7d732f346c16eb740f49
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Sat Sep 27 11:01:24 2008 +0800
+
+ intel: Copy data from card memory back to backing store when mapping.
+
+ Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17705
+
+commit 2db8e0c8ef8c7a66460fceda129533b364f6418c
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Sep 23 17:06:01 2008 -0700
+
+ intel: Allow up to 15 seconds chewing on one buffer before acknowledging -EBUSY.
+
+ The gltestperf demo in some cases took over seven seconds to make it through
+ one batchbuffer on a GM965.
+
+ Bug #17004.
+
+commit 0dccf017ab629d69fce91e18b013882ecb45f55d
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Sep 23 10:48:39 2008 -0700
+
+ intel: Replace wraparound test logic in bufmgr_fake. Again.
+
+ I'd swapped the operands, so if we weren't in lockstep with the hardware we
+ said the sequence was always passed. Additionally, a race was available that
+ we might have failed at recovering from. Instead, I've replaced the logic
+ with new stuff that should be more robust and not rely on all the parties in
+ userland following the same IRQ_EMIT() == 1 protocol. Also, in a radical
+ departure from past efforts, include a long comment describing the failure
+ modes and how we're working around them.
+
+ Thanks to haihao for catching the original issue.
+
+commit 1b3abe62b5751d0514d57aa850e584dca7dfc23e
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Sep 23 10:47:21 2008 -0700
+
+ intel: Do strerror on errno, not on the -1 return value from ioctl.
+
+commit 3949f3c9eaad9547fe046ca4d469fa7cc8f12304
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Mon Sep 22 10:16:19 2008 +0800
+
+ intel: Fix driver-supplied argument to exec function (fd.o bug #17653).
+
+commit 8ca06eb492f861dbf049a2e104e4e2a5ba814c13
+Author: Robert Noland <rnoland@2hip.net>
+Date: Wed Sep 17 23:10:15 2008 -0400
+
+ [FreeBSD] Convert to using cdevpriv for file_priv tracking
+
+commit ee6bcabc506e4d506fb65447c405f8514ab1f4e1
+Author: Ben Skeggs <skeggsb@gmail.com>
+Date: Wed Sep 17 22:18:03 2008 +1000
+
+ nv50: add initial context for chipset 0xaa
+
+ This just doesn't look right..
+
+commit d55e8090fa9d0f3bb67eeb8cc61c0ed6345d41b4
+Author: Ben Skeggs <skeggsb@gmail.com>
+Date: Wed Sep 17 22:03:38 2008 +1000
+
+ nv50: add initial context to match ctxprog for chipset 0x50
+
+commit 4d2f1257fab84bf66bd1154a1c829317584fd5f7
+Author: Ben Skeggs <skeggsb@gmail.com>
+Date: Wed Sep 17 15:13:27 2008 +1000
+
+ nv50: add ctxprog for chipset 0x50
+
+commit 301be1dc9be8a83f5092417573967f35766227bc
+Author: Ben Skeggs <skeggsb@gmail.com>
+Date: Wed Sep 17 15:02:54 2008 +1000
+
+ nv50: add ctxprog for chipset 0xaa
+
+commit f152482bdecaa16db36b20b445a480445d18048c
+Author: Ben Skeggs <skeggsb@gmail.com>
+Date: Wed Sep 17 14:49:04 2008 +1000
+
+ nv50: add support for chipset 0x92
+
+commit 973c634eaa54ee4085a72102c690bc643cb2d7a8
+Author: vehemens <vehemens@verizon.net>
+Date: Mon Sep 8 22:06:09 2008 -0700
+
+ Remove incomplete and obsolete free/net/open code.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit b54d15d8fd252df5f0914ab245431e66b9a4e8ab
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Sep 10 20:04:42 2008 -0700
+
+ Add missing \ to libdrm_la_SOURCES
+
+ Reported by jcristau.
+
+commit 368b392e6dcd19cb75675c0c18d02f70257af1df
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Sep 10 13:54:34 2008 -0700
+
+ intel: don't forget to include config.h in bufmgr code.
+
+ Thanks to airlied for catching this.
+
+commit f9d98beefc9e7b8d06a29f5b69a19f10fd3c435f
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Sep 8 08:51:40 2008 -0700
+
+ intel: move drm calls to exec buffers to libdrm_intel.
+
+ This avoids duplicating the effort in 3 places. Also, added emit/wait fence
+ callbacks back in bufmgr_fake since we need it for non-drm 2d. Sigh.
+
+commit 869d8bebedddf2075c59d6bffea8ee640cb80353
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Sep 6 03:07:41 2008 +0100
+
+ intel: Move IRQ emit/wait from callbacks into the bufmgr.
+
+ In the process, work around the glaring bugs of the kernel irq wait function.
+
+commit 738e36acbce24df0ccadb499c5cf62ccb74f56df
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Sep 5 10:35:32 2008 +0100
+
+ Move intel libdrm stuff to libdrm_intel.so
+
+ dri_bufmgr.h is replaced by intel_bufmgr.h, and several functions are renamed,
+ though the structures and many functions remain dri_bufmgr_* and dri_bo_*
+
+commit 09cf0f0213652609d09154ce2859c03cf97ab11e
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Sep 3 23:05:16 2008 +0100
+
+ drm: Add tests for GEM_FLINK ioctl.
+
+commit 828ae3f6b88b5a69a56b2961307e40ed95edea29
+Author: Robert Noland <rnoland@2hip.net>
+Date: Mon Sep 8 16:40:52 2008 -0400
+
+ [FreeBSD] We need to call drm_detach before we free dev->driver.
+
+ The driver is in control of the show, so when you try and unload a module
+ the driver detach routine is called first. It is what drives the whole
+ unload process and so lots of panics occur if dev->driver is already
+ free.
+
+commit 2880c86eb246aceeb5c750e27259a7b6d8897328
+Author: Robert Noland <rnoland@2hip.net>
+Date: Sun Sep 7 12:44:02 2008 -0400
+
+ [FreeBSD] Implement drm_ioremap_wc() to set a range of mem to write-combining
+
+commit 740f09bffde20d9207497bd107d50941ca21278a
+Author: Robert Noland <rnoland@2hip.net>
+Date: Sat Sep 6 21:08:33 2008 -0400
+
+ [FreeBSD] IGP gart needs to be un-cached.
+
+ Airlied inadvertently discovered that the IGP gart needs to be un-cached
+ for radeon rs485 and rs690 to work. Initial tests by placing a wbinvd()
+ after allocating the gart were successful. This is an attempt at a more
+ appropriate method of achieving success.
+
+commit be5fad45ee4e81997784f258fcdfaf0a303dd666
+Author: vehemens <vehemens@verizon.net>
+Date: Sat Sep 6 18:02:31 2008 -0700
+
+ Free temp_pagelist on error. Free in reverse order. Noticed by open.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 9ad5a6d0d73ba58ec7c2f66d0c5355185f2f68c6
+Author: vehemens <vehemens@verizon.net>
+Date: Sat Sep 6 15:33:47 2008 -0700
+
+ Pass lock data like linux and open.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit b8a9cebddc7063bc0dae889dac43359c0cb9bfa5
+Author: vehemens <vehemens@verizon.net>
+Date: Sat Sep 6 14:19:32 2008 -0700
+
+ Move order to end like linux.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 0808cf923d4a851b100d9b7022cb82f5e1f52e28
+Author: vehemens <vehemens@verizon.net>
+Date: Sat Sep 6 14:16:51 2008 -0700
+
+ Style white space cleanup part 2.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 6f2479c67432f764bfc4e248689f1737c1935237
+Author: Robert Noland <rnoland@2hip.net>
+Date: Sat Sep 6 18:37:06 2008 -0400
+
+ [FreeBSD] Ensure that drm_pci_alloc is never called while locks are held.
+
+commit 31709aa2be54877c45ca382bf370b41dbaf5c2ec
+Author: vehemens <vehemens@verizon.net>
+Date: Tue Sep 2 13:56:35 2008 -0700
+
+ Reorder lock functions like linux.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 76dd74c64ef9b92025e76dd256e0641ff6fce0f4
+Author: vehemens <vehemens@verizon.net>
+Date: Tue Sep 2 04:57:36 2008 -0700
+
+ Style white space cleanup.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit ed6dd03818f2fa4dd0f2ba34dee58b09c7ff253e
+Author: vehemens <vehemens@verizon.net>
+Date: Tue Sep 2 02:43:19 2008 -0700
+
+ Need M_NOWAIT for malloc.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 3f915f68e8f68fe0fc3d0e1eb8a18a16f8f397da
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Sep 5 11:52:53 2008 -0400
+
+ i915: fix i915_ring_validate()
+
+commit ce84511f4d647d5ce9fd52b838ee944e23050954
+Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
+Date: Fri Sep 5 00:17:52 2008 +0200
+
+ nouveau: 8200 cards are 0xA0 family.
+
+commit 99f8cce3eae79c9cf5e9897ef1af8eac24b38c09
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Sep 2 10:07:14 2008 +1000
+
+ drm: fix sysfs error path.
+
+ Pointed out by Roel Kluin on dri-devel.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit cd7d71f19cf2a16521c9da1815421c6a5f12a58e
+Author: Dave Airlie <airlied@linux.ie>
+Date: Sun Aug 31 07:27:26 2008 +1000
+
+ radeon: make writeback work after suspend/resume.
+
+ While re-writing this for modesetting, I find we disable writeback on
+ resume.
+
+commit 2b278047153df729caf9e516a432b2e76398cd3a
+Author: vehemens <vehemens@verizon.net>
+Date: Wed Aug 27 19:11:04 2008 -0700
+
+ [FreeBSD] Use driver features macros and flags
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 2649103bf9c4eb471a10800f4a3161dca6249086
+Author: vehemens <vehemens@verizon.net>
+Date: Fri Aug 29 13:18:54 2008 -0400
+
+ [FreeBSD] Convert drm_driver to a pointer like linux.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 71f0a3e389efb6c92a84299d05beb2a1bfa53469
+Author: vehemens <vehemens@verizon.net>
+Date: Fri Aug 29 12:47:00 2008 -0400
+
+ [FreeBSD] Replace typedefs on bsd.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit b92f5577670f99ded76e201a71aaa23cce8f7577
+Author: vehemens <vehemens@verizon.net>
+Date: Fri Aug 29 12:40:30 2008 -0400
+
+ [FreeBSD] Catch up to vblank rework for via.
+
+ (No, we don't build via right now.)
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 043ad591b55ee8d4ac3ff65038705219d1893b12
+Author: vehemens <vehemens@verizon.net>
+Date: Fri Aug 29 12:37:29 2008 -0400
+
+ [FreeBSD] Correct debug message
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit c7f7b6d7e2f46753381de51e4b0b00211a1a6b5f
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Aug 29 12:29:50 2008 -0400
+
+ [FreeBSD] Fix a couple of locking problems.
+
+commit f8a14b1f9556919617208a8eb88ff88d6c77f08d
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Aug 29 12:23:35 2008 -0400
+
+ [FreeBSD] Increase debugging output for vblank code.
+
+ Doing my part to make DRM_DEBUG more chatty...
+
+commit b460aeec3ea817540e43c8215f2cdf432c957289
+Author: Tomas Carnecky <tom@dbservice.com>
+Date: Fri Aug 29 00:43:19 2008 +0200
+
+ Fix drm_realloc when you're reallocing into something smaller.
+
+commit bffbb497e2502b0aa6fd24804251d6a21d8fa034
+Author: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
+Date: Wed Aug 27 02:27:10 2008 +0200
+
+ Change git-describe into git describe.
+
+commit 0239594fc318c2b55bbfbea27f23218f6d7a4b34
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Aug 26 14:28:08 2008 -0400
+
+ [intel_bufmgr_gem] Remember global name when creating buffer from name.
+
+commit c8fd8d3a0d37dc09165ac77c7d38938ef9942011
+Author: Robert Noland <rnoland@2hip.net>
+Date: Sun Aug 24 15:53:17 2008 -0400
+
+ i915: Fix i915 build on FreeBSD
+
+ ifdef out all the gem stuff for now. Also, the msi stuff isn't portable
+ the way it is... I'll try and fix that up sometime soon.
+
+commit bfea578352aaaed08555e86c9951b3932f39d122
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Aug 22 21:45:41 2008 -0400
+
+ [FreeBSD] Add drm_drawable_free_all()
+
+commit 0687c0a4ec78730f752cee04a5b0862f47dbf026
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Aug 22 21:34:25 2008 -0400
+
+ [FreeBSD] Fix long standing memory leak in drm_remove_magic.
+
+ We shuffled all the links around to disconnect the entry, but
+ never free it. We would incorrectly free the last entry in the
+ hash chain if nothing matched.
+
+commit d0acbe4553d27df3fdc217c956c609c54ebb51e6
+Author: Robert Noland <rnoland@2hip.net>
+Date: Fri Aug 22 21:32:37 2008 -0400
+
+ i915: Convert vblank on disabled pipe DRM_ERROR to DRM_DEBUG.
+
+commit 739b01dde43c40398d9b0d177e9d330e06cdc2ae
+Author: Robert Noland <rnoland@2hip.net>
+Date: Wed Aug 20 17:20:31 2008 -0400
+
+ i915: Clear sarea_priv during lastclose.
+
+ sarea_priv needs to be NULL before i915_initialized is called to
+ properly reset it. The stale value produces a panic any time something
+ opens/closes drm without calling initialize. i.e. version checking
+
+commit 1f3c4dd938a1710d762bac37dfb1b17c90af4732
+Author: Robert Noland <rnoland@2hip.net>
+Date: Wed Aug 20 17:15:46 2008 -0400
+
+ i915: Free dev->dev_private on unload.
+
+commit 3e9541230d7b7c32ecb36c1edc5124b6991222be
+Author: vehemens <vehemens@verizon.net>
+Date: Wed Aug 13 17:19:35 2008 -0400
+
+ [FreeBSD] Move vblank bits into their own structure.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit e6010778a8edf96dbfb4bc1f7cf0ce5706eee733
+Author: vehemens <vehemens@verizon.net>
+Date: Wed Aug 13 17:17:05 2008 -0400
+
+ [FreeBSD] Fix lock leak.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 16c1a87580af89be02e7e6c1898f18b36829e007
+Author: Robert Noland <rnoland@2hip.net>
+Date: Wed Aug 13 17:05:59 2008 -0400
+
+ i915: Move spinlock init / destroy to load / unload time.
+
+ This resolves the panic on FreeBSD during VT switch, without attempting
+ any of the more lofty goals for the time being.
+
+commit 9101a0205c897fea28e6a3d875111a83ad7f7732
+Author: Dave Airlie <airlied@linux.ie>
+Date: Sun Aug 24 16:54:43 2008 +1000
+
+ libdrm: add udev support.
+
+ This patch allows you to --enable-udev, and will avoid having libdrm
+ make device nodes. If you are using udev, you should really --enable-udev
+ your libdrm.
+
+commit 0da66c27fa2aabdbaf4c003ba3712a61253d7ffe
+Author: root <root@gdp.(none)>
+Date: Tue May 6 23:04:55 2008 +0100
+
+ nouveau: fifo and graphics engine suspend and resume for nv04-nv4x
+
+ Corresponding DDX patch at http://people.freedesktop.org/~stuart/nv0x-nv4x_suspend/
+
+commit 41b83a99583486ad4f8760a6537d34783769bfc3
+Author: Coleman Kane <cokane@cokane.org>
+Date: Mon Aug 18 17:08:21 2008 -0400
+
+ Change prototype of drmIoctl to unsigned long request.
+
+ This resolves and issue on amd64 FreeBSD and it looks like the
+ linux ioctl syscall should be unsigned long as well.
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit a5381cac55e54a535acf752970886b659948563c
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Sun Aug 17 00:41:50 2008 +0200
+
+ nouveau: make it compile under 2.6.27
+
+commit ba840fca19077d352277519c5fa032e3b107ae27
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Thu Aug 14 19:35:55 2008 +0200
+
+ linux: on_each_cpu has 3 args on 2.6.27
+
+commit af12ef4f6b4ca111d9a2ef45263ad89610498724
+Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
+Date: Wed Aug 13 10:04:21 2008 +0200
+
+ Don't call the vblank tasklet with irqs disabled.
+ If a specific tasklet shares data with irq context,
+ it needs to take a private irq-blocking spinlock within
+ the tasklet itself.
+
+commit b0e68829462aad00ce68be998da6313bca754e9a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Aug 12 22:22:15 2008 -0400
+
+ [intel_bufmgr_gem] Fix flink buffer name caching (#17085, #17092).
+
+ Store the global name in global_name, don't overwrite the gem_handle.
+
+commit 966c783e96b3f8ae0271db3dd6862177c659ab13
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon Aug 11 10:44:39 2008 -0700
+
+ libdrm: Allow build outside of source tree.
+
+commit 08faab27e5fbf12e53dc9d4bf38eda8da1a55007
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Aug 11 10:58:41 2008 +1000
+
+ drm_vm: fix for build on 2.6.22
+
+ thanks to malc0 for pointing it out
+
+commit 280d415957c0af099c44aaecb69a06c68c86aebb
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Aug 11 10:47:00 2008 +1000
+
+ drm: add OS_HAS_GEM option.
+
+ To build i915 driver pass OS_HAS_GEM=1 to make for now
+
+commit 12e6a114cf9ebd0e1d8ccdbf9a7aef7c67e24b58
+Author: Dave Airlie <airlied@linux.ie>
+Date: Sat Aug 9 17:19:16 2008 +1000
+
+ drm: TRUE/true
+
+commit f7a99407153eaba5724b6f1f2cadab62c6a50a26
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 8 15:55:34 2008 -0700
+
+ Drop TTM interfaces from the userland library.
+
+commit 9e9d9b1741965f6529153bc2bcbe2dd8ba96ef3f
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 8 14:08:43 2008 -0700
+
+ Fix compile warning from check_aperture change.
+
+commit e1b8e79796b172c356af98eb49107c8abbebfe5a
+Merge: 0c47151... 46e9274...
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 8 14:05:01 2008 -0700
+
+ Merge branch 'drm-gem'
+
+ Conflicts:
+
+ shared-core/i915_dma.c
+
+ This brings in kernel support and userland interface for intel GEM.
+
+commit 46e9274e8538e5b0517f611dca99dde611f4e95d
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 8 13:13:46 2008 -0700
+
+ Replace the check_aperture API with one we can make thread-safe.
+
+ While the bufmgr isn't thread-safe at the moment, we need it to be for shared
+ objects between contexts.
+
+commit 0c47151a571827905c34649208e22f8ec0175d62
+Author: Stuart Bennett <sb476@cam.ac.uk>
+Date: Fri Aug 8 16:20:52 2008 +0100
+
+ nouveau: wait for pgraph idle after loading or saving a context
+
+ the nvidia driver does this, and it stops the error message appearing on nv40
+
+commit 5968e061db90451b19c3948bbd91c6d5ac9af941
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 7 15:26:30 2008 -0700
+
+ Make flink save the kernel-assigned name and return it instead of creating another name
+
+commit ac20e14d2361160cf199dc31c3fe1ffbacdf5bb7
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Aug 4 23:33:03 2008 -0700
+
+ Switch from shmem_getpage to read_mapping_page
+
+commit dc0546c87ffc6701802d6141810c24954274e1ac
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 5 16:06:40 2008 -0700
+
+ [gem-intel] Retiring flush requests should clear flushed write_domains
+
+ When i915_gem_retire_request has a flush which matches an object write
+ domain, clear the write domain. This will move the object to the inactive
+ list rather than the flushing list, avoiding trouble with objects left stuck
+ on the flushing list.
+
+commit ceb3d5e3834452f9d54f974b8066f90168467443
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 5 14:44:53 2008 -0700
+
+ [gem-intel] Don't clear write_domain until flush completes
+
+ In i915_gem_object_wait_rendering, if the object write domain is being
+ written by the GPU, the appropriate flushing commands are written to the
+ device and an additional request queued to mark that flush. Finally, the
+ function blocks on that new request.
+
+ The bug was that the write_domain in the object was cleared before the
Reply to: