libdrm: Changes to 'debian-unstable'
ChangeLog | 911 ++++++++++++++++++++----
configure.ac | 9
debian/changelog | 10
debian/control | 2
debian/libdrm-intel1.symbols | 1
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
25 files changed, 2449 insertions(+), 270 deletions(-)
New commits:
commit 1ab2fa756dca9e03faf1c6b8a295a4e9d93d7aa0
Author: Brice Goglin <bgoglin@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 <bgoglin@debian.org> Sat, 11 Apr 2009 23:11:50 +0200
+ -- Brice Goglin <bgoglin@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 <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>, David Nusinow <dnusinow@debian.org>
+Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>, David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@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 <bgoglin@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 <jbarnes@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 <jbarnes@virtuousgeek.org>
+Date: Fri Apr 10 15:24:41 2009 -0700
+
+ Bump version to 2.4.8
+
+commit 3637dcc66d707aa9ababf0b12cd4a299559522f5
+Author: Jesse Barnes <jbarnes@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 <krh@redhat.com>
+Date: Thu Apr 9 15:19:10 2009 -0400
+
+ Bump version to 2.4.7
+
+commit ec9b7b320a724e49d61375b4ad53e2c88fa30f66
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Apr 9 15:17:51 2009 -0400
+
+ test: Avoid recursive dependency in makefile
+
+commit a85e07b9031c819f3cdf54b66c90ac0c450e3e75
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Apr 9 15:02:40 2009 -0400
+
+ test: Makefile.am grammar nazi
+
+commit 1faab66cfd1a854925da6ff7109aa614292dea90
+Author: Dave Airlie <airlied@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 <krh@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 <krh@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 <krh@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 <rnoland@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 <jbarnes@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 <wallbraker@gmail.com>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 93e65271601e6a1c7c90453f2f13157ae24b35c2
+Author: Stuart Bennett <stuart@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 <jbarnes@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 <jbarnes@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 <eric@anholt.net>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit c9cfeaa5542e08381a8144d0a5bd96036a19082f
+Author: Stuart Bennett <stuart@freedesktop.org>
+Date: Tue Mar 24 23:39:41 2009 +0000
+
+ nouveau: plug drm fifo ioremap leak (#14941)
+
+commit 03ca202fa56ad7711ad0f7527a1e537154093e8a
+Author: Stuart Bennett <stuart@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 <stuart@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 <bskeggs@redhat.com>
+Date: Wed Mar 25 08:10:12 2009 +1000
+
+ libdrm/nouveau: fix typo in nouveau_device_close()
+
+commit 98b0df3953f229fd5fb7484d2f566aeb0443c12f
+Author: Ben Skeggs <bskeggs@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 <bskeggs@redhat.com>
+Date: Fri Mar 20 10:32:47 2009 +1000
+
+ libdrm/nouveau: remove unneccesary null ptr checks
+
+commit c37fca4ef678667bcba9c45c6e0a59c8d174c7c5
+Author: Ben Skeggs <bskeggs@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 <madman2003@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 <bskeggs@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 <rnoland@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 <rnoland@2hip.net>
+
+commit e8d34762558224bb76862425de965c47858f2afd
+Author: Robert Noland <rnoland@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 <rnoland@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 <rnoland@2hip.net>
+Date: Mon Mar 16 00:35:18 2009 -0500
+
+ FreeBSD: Improve the debug output of drm_mmap().
+
+commit f8f49aa6ec10e281b08279143f2bd999df118147
+Author: Robert Noland <rnoland@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 <rnoland@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 <rnoland@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 <rnoland@2hip.net>
+Date: Mon Mar 16 00:07:31 2009 -0500
+
+ FreeBSD: Minor code cleanup.
+
+commit b0acc886069c0054da98059319a84eaf60114d32
+Author: Robert Noland <rnoland@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 <rnoland@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 <rnoland@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 <rnoland@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 <rnoland@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 <vehemens@verizon.net>
+Date: Sun Mar 8 18:17:15 2009 -0700
+
+ FreeBSD use kdev for kernel device name
+
+ Signed-off-by: Robert Noland <rnoland@2hip.net>
+
+commit 391c92ae1799f0d1fddb2321c5713afc58575514
+Author: Ben Skeggs <bskeggs@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 <rnoland@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 <rnoland@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 <rnoland@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 <rnoland@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 <pq@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 <pq@iki.fi>
+
+commit a6b28a86a6141259583c3699d1a2d9b26e366ba8
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Tue Mar 3 22:20:59 2009 +0200
+
+ drm, via: drop Linux < 2.6.20 support
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit f44c740dc7a05d651df7604baad8f667836d1b09
+Author: Pekka Paalanen <pq@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 <pq@iki.fi>
+
+commit 081b2d6da22e08e1448285d647a35b17905512cf
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Mon Mar 2 22:39:32 2009 +0200
+
+ drm: drop Linux < 2.6.18 support
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit 62f4344c98b72535df88a5a3d577c1df314e4f9b
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Mon Mar 2 22:35:23 2009 +0200
+
+ drm: drop Linux < 2.6.16 support
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit 056ce26344197042cbef800436f16d3f8ba288c8
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Mon Mar 2 22:26:46 2009 +0200
+
+ drm: drop Linux < 2.6.15 support
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit b47de8d5a3dbfc669c7ba9c6cb66a7491c30b537
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Mon Mar 2 22:09:26 2009 +0200
+
+ drm: drop Linux < 2.6.12 support
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit 4c439ac4a7fa627691dfcd6a4be67cd95d8d33ee
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Mon Mar 2 00:17:44 2009 +0200
+
+ drm: drop Linux < 2.6.10 support
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit 4bdddf57155a774318ed3739ede9511f074d394e
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Mon Mar 2 00:13:00 2009 +0200
+
+ drm: drop Linux <= 2.6.8 support
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit d3f25ccca882f91071a0d68bb4b75ff871f0cc04
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Sun Mar 1 23:53:02 2009 +0200
+
+ drm: drm_bo_mmap_locked() is static.
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit a6dd0afa87558a670f970e61b023f45a396539eb
+Author: Pekka Paalanen <pq@iki.fi>
+Date: Sat Feb 28 17:45:02 2009 +0200
+
+ drm, ati: fix printf format warnings
+
+ Signed-off-by: Pekka Paalanen <pq@iki.fi>
+
+commit 9e8591dbdbd99ec1cc4922d61ec4cc54ef42f0ac
+Author: Pekka Paalanen <pq@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 <pq@iki.fi>
+
+commit ad64ff30d0e85486bba8fb6f0e2fcb1caa06fd5c
+Author: Robert Noland <rnoland@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 <rnoland@2hip.net>
+Date: Wed Feb 25 17:59:26 2009 -0600
+
+ Move vblank_init to driver load time.
+
+commit 7ce8d4c1fec618ac2578ea0ddb8915b1b41ab9cb
+Author: Eric Anholt <eric@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 <rnoland@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 <jkim@FreeBSD.org>
+
+commit 948af0bd9b9eade489599d7ec160d42706331779
+Author: Robert Noland <rnoland@2hip.net>
+Date: Wed Feb 25 14:19:01 2009 -0600
+
+ i915: Backport jbarnes gm45 vblank counter patch.
+
+commit efa485b2cf2f1f46760a3d9297ba1a73a2dbcd05
+Author: Eric Anholt <eric@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 <rnoland@2hip.net>
+Date: Tue Feb 24 15:49:45 2009 -0600
+
+ FreeBSD: Drop the Giant lock.
+
+commit b9b8e8f3cc61a37cce2ae48957514ce6a4f30566
+Author: Robert Noland <rnoland@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 <rnoland@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 <rnoland@2hip.net>
+Date: Tue Feb 24 14:00:21 2009 -0600
+
+ i915: A few whitespace cleanups.
+
+commit 04d94197e69ed7d3cad194e8579631849135b08c
+Author: Robert Noland <rnoland@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 <rnoland@2hip.net>
+Date: Tue Feb 24 12:28:42 2009 -0600
+
+ radeon: Prepare radeon for msi support.
+
+commit d45bc6667c6f10cbb3832178e4a6a8cdd036b739
+Author: Robert Noland <rnoland@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 <krh@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 <krh@redhat.com>
+Date: Tue Feb 24 11:19:41 2009 -0500
+
+ nouveau: Also dist nouveau_private.h.
+
+commit 1c381092a310af9b1b39b3a983ad5760b71a9025
+Author: Robert Noland <rnoland@2hip.net>
+Date: Tue Feb 24 00:22:56 2009 -0600
+
+ FreeBSD: Rip out the locked task support now that i915 no longer uses it.
+
+commit 9f94e39f0d5bed48d5ea56767cd92a2509908df0
+Author: Robert Noland <rnoland@2hip.net>
+Date: Mon Feb 23 22:39:07 2009 -0600
+
+ i915: Rip out the use of vblank_swap
+
+commit 9d402905c07a38e1eb327db96ae561de7930f616
+Author: Robert Noland <rnoland@2hip.net>
+Date: Mon Feb 23 20:22:44 2009 -0600
+
+ FreeBSD: There is no compelling reason to hold the lock here.
+
+ When I was lock profiling, this was high up on the list and I
+ see no reason to do it.
+
+commit d6c97868361da48d13a5fe7fe106d67a64969ab1
+Author: Robert Noland <rnoland@2hip.net>
+Date: Mon Feb 23 20:16:15 2009 -0600
+
+ FreeBSD: Don't set PZERO in mtx_sleep.
+
+commit a9486ee3a8aaae888b4a05ae0d475cfa2a2641cb
+Author: Robert Noland <rnoland@2hip.net>
+Date: Mon Feb 23 20:01:26 2009 -0600
+
+ FreeBSD: Set MAP_NOSYNC on mmaps.
+
+ There is no reason to gratuitously sync these maps to swap.
+
commit a773ce1db8801fcbbdb55b54172c9cd48b92e2d7
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 23 13:30:20 2009 -0800
@@ -640,7 +1233,7 @@ Date: Wed Dec 10 15:37:29 2008 -0800
Update .gitignore with new modetest program
commit 6656db10551bbb8770dd945b6d81d5138521f208
-Merge: c99566f... 12e68f8...
+Merge: c99566f 12e68f8
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Dec 9 10:23:43 2008 -0800
@@ -655,14 +1248,14 @@ Date: Mon Dec 8 14:05:32 2008 +1000
we already have a 2.3.x version out there
commit 12e68f8059485fb4f02a15f74ab2fa3bdff38c81
-Merge: d5d5aca... b0d93c7...
+Merge: d5d5aca b0d93c7
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Dec 3 11:54:07 2008 -0800
Merge branch 'master' into modesetting-gem
commit d5d5aca7f959f0e357f99dd517a421c015d0712f
-Merge: 10c3e1a... 7e4e0fb...
+Merge: 10c3e1a 7e4e0fb
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Dec 3 11:53:36 2008 -0800
@@ -701,7 +1294,7 @@ Date: Fri Nov 21 12:43:44 2008 +1100
In any case, at least one of the original NV50 chipsets work now.
commit 10c3e1a8b55355b1ae1697ebf3d77ac4702d61c9
-Merge: 5923831... 2e2fd6c...
+Merge: 5923831 2e2fd6c
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Nov 20 11:01:24 2008 -0800
@@ -731,7 +1324,7 @@ Date: Wed Nov 19 23:17:27 2008 +0100
Unbreak drm build.
commit c67a83dfe1b60f81343ff7c2604a96b18ecb3b0c
-Merge: 60c1e3a... e98eda9...
+Merge: 60c1e3a e98eda9
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Nov 19 12:42:49 2008 -0800
@@ -817,7 +1410,7 @@ Date: Fri Nov 14 12:08:27 2008 +0100
should help in tracking unbalanced ref/unref calls.
commit 965b4d662a5236ee5aeb94a70f62565b6ed5644c
-Merge: 9a4cb7e... 7e27b3b...
+Merge: 9a4cb7e 7e27b3b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Nov 13 15:30:06 2008 -0800
@@ -902,7 +1495,7 @@ Date: Wed Nov 12 15:56:40 2008 +0100
help in avoiding moving content in or out)
commit 6d59bad8e9cab6170e1af3d67597b6f5f145c33f
-Merge: 72997fb... 15464f5...
+Merge: 72997fb 15464f5
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Mon Nov 10 22:21:32 2008 +0100
@@ -1016,7 +1609,7 @@ Date: Wed Nov 5 16:00:04 2008 +0100
radeon: libdrm_radeon add handle to debug string
commit ddfb12b32e64d00d302f7fbb36fb079deec3646f
-Merge: 7651b4c... 68fcb77...
+Merge: 7651b4c 68fcb77
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Wed Nov 5 15:59:37 2008 +0100
@@ -1299,7 +1892,7 @@ Date: Thu Oct 30 09:33:07 2008 -0700
released code is maintained using #defines.
commit 40c64eb5243bbd511f30e68cb4abce55b364a74f
-Merge: 5d86195... 1db35ba...
+Merge: 5d86195 1db35ba
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Wed Oct 29 23:41:48 2008 +0100
@@ -1379,7 +1972,7 @@ Date: Mon Oct 27 14:39:05 2008 -0400
This allows us to not crash X when using newer Intel ddx drivers.
commit 3b17b50e9c49ae113c7ad1c4a0af51e873de1a7e
-Merge: 7617d1f... 389b761...
+Merge: 7617d1f 389b761
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Mon Oct 27 19:33:56 2008 +0100
@@ -1805,14 +2398,14 @@ Date: Tue Sep 30 16:35:26 2008 -0700
callback to get it.
commit 7b3aa626482963cc52086da629f682fce2c7322c
-Merge: 972f657... 9c6732e...
+Merge: 972f657 9c6732e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Sep 30 14:17:27 2008 +1000
Merge remote branch 'origin/modesetting-gem' into modesetting-gem
commit 972f6572652bc4a2f6c44c525e5e91f2becdb62a
-Merge: 89126bb... 2db8e0c...
+Merge: 89126bb 2db8e0c
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Sep 26 15:37:21 2008 +1000
@@ -1854,7 +2447,7 @@ Date: Fri Sep 26 17:20:04 2008 -0400
to try using atom on r4xx.
commit 89126bb58ec82511758bed36a28e698b721fb435
-Merge: d883347... ea9711b...
+Merge: d883347 ea9711b
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Sep 25 18:47:47 2008 -0400
@@ -2596,7 +3189,7 @@ Date: Fri Aug 22 07:08:29 2008 +1000
drm: add gpu create script
commit 76cec451d3380c0db28be58123904b489be672a7
-Merge: ba61880... 2d4cf9c...
+Merge: ba61880 2d4cf9c
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Tue Aug 19 13:08:47 2008 -0400
@@ -2689,7 +3282,7 @@ Date: Sat Aug 16 12:09:24 2008 -0700
Makes it build again.
commit d313108167a793652a5fe4c1015198e0a9deac4c
-Merge: 893315d... 2030db7...
+Merge: 893315d 2030db7
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sat Aug 16 11:45:53 2008 -0700
@@ -2744,7 +3337,7 @@ Date: Thu Aug 14 09:43:23 2008 +1000
i915: fixup from last merge hopefully
commit 2d4420c6669dbaead27346b8c7e1979edc94ae5a
-Merge: 1c6abce... 2a65759...
+Merge: 1c6abce 2a65759
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 14 09:36:34 2008 +1000
@@ -2923,14 +3516,14 @@ Date: Wed Aug 13 11:39:22 2008 -0700
Needed for the modesetting case where we initialize the ring at load time.
commit b8724ae647c2c622f33f3a82d1b8632c887fa69b
-Merge: 2f03ba4... 9a2adc4...
+Merge: 2f03ba4 9a2adc4
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Aug 13 10:09:41 2008 -0700
Merge branch 'modesetting-101' into modesetting-gem
commit 2f03ba4aad1718a36168550b6a146b79540252e6
-Merge: 085df64... b0e6882...
+Merge: 085df64 b0e6882
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Aug 13 10:08:02 2008 -0700
@@ -3037,7 +3630,7 @@ Date: Fri Aug 8 14:08:43 2008 -0700
Fix compile warning from check_aperture change.
commit e1b8e79796b172c356af98eb49107c8abbebfe5a
-Merge: 0c47151... 46e9274...
+Merge: 0c47151 46e9274
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 8 14:05:01 2008 -0700
@@ -3075,7 +3668,7 @@ Date: Fri Aug 8 16:04:45 2008 +1000
not all there yet
commit 8074b2e83d18bbf85d1c3284f561d849c829dd4b
-Merge: c7fb19e... 4585787...
+Merge: c7fb19e 4585787
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Aug 7 17:15:50 2008 -0700
@@ -3090,7 +3683,7 @@ 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 c7fb19e9b074281f143b0e1c9d054ebcf5ff1091
-Merge: 086716c... ac20e14...
+Merge: 086716c ac20e14
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Aug 7 14:02:04 2008 -0700
@@ -3234,7 +3827,7 @@ Date: Mon Aug 4 14:52:58 2008 +1000
drm: remove unneeded debugging
commit 086716c8e2516dd71e94ebda03e20943188a5e5e
-Merge: 5052e96... ccbaad5...
+Merge: 5052e96 ccbaad5
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Aug 1 13:35:56 2008 -0400
@@ -3262,7 +3855,7 @@ Date: Fri Aug 1 07:43:58 2008 +1000
Please re-do over properly
commit 5052e966ec7fe5146c2d73b90482003619add5da
-Merge: 6d4e147... 95c0274...
+Merge: 6d4e147 95c0274
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 31 15:18:32 2008 -0400
@@ -3420,7 +4013,7 @@ Date: Mon Jul 28 16:33:50 2008 -0700
intel-gem: checkpatch.pl on drm_proc.c new contents.
commit 1d2bb68d28fe39746299ee8ddb664a62de839b0c
-Merge: 487c42b... 514c05c...
+Merge: 487c42b 514c05c
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 28 15:17:21 2008 -0700
@@ -3564,7 +4157,7 @@ Date: Sat Jul 26 08:56:23 2008 +1000
for the DDX to test modesetting.
commit 31da9492a4129f5255e949836c51e9dfbfb270c4
-Merge: 11d3075... 7fd7ba8...
+Merge: 11d3075 7fd7ba8
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Jul 26 08:46:38 2008 +1000
@@ -3601,7 +4194,7 @@ Date: Sat Jul 26 08:41:01 2008 +1000
modesetting: pass file_priv into cursor set functions
commit fb05c4d621084d7a3fb3dd52d7d9c888eac852d0
-Merge: 2556341... 5342845...
+Merge: 2556341 5342845
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Jul 26 08:38:59 2008 +1000
@@ -4031,7 +4624,7 @@ Date: Fri Jul 11 14:47:33 2008 -0700
Only fully tested on GM965 so far.
commit 2556341f8baf0e0b7b5f7843135e43e662751af0
-Merge: 38a5f66... 0b7d9a9...
+Merge: 38a5f66 0b7d9a9
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 9 14:53:47 2008 +1000
@@ -4064,7 +4657,7 @@ Date: Thu Jun 26 09:35:14 2008 -0700
[intel-gem] typo fix in DRM_ERROR
commit 3e02f7fd310ae062d250d8db01ddc3b7de3d7943
-Merge: 7fd8a5d... d250a55...
+Merge: 7fd8a5d d250a55
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 7 15:43:43 2008 -0400
@@ -4493,7 +5086,7 @@ Date: Tue Jun 24 20:29:08 2008 +0200
NV50: minor change
commit ce2effbe2dd205e67e294304b97ee7bf221137b1
-Merge: 2c6feb7... 01a33d7...
+Merge: 2c6feb7 01a33d7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 24 10:03:05 2008 -0700
@@ -4871,7 +5464,7 @@ Date: Wed Jun 18 15:31:48 2008 -0700
pci_disable_msi() is called.
commit 86accbcb344ff25fbb47a788bb0f7464b5cd797f
-Merge: c843d47... e7424e4...
+Merge: c843d47 e7424e4
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Wed Jun 18 15:25:54 2008 -0700
@@ -4896,7 +5489,7 @@ Date: Wed Jun 18 14:51:46 2008 -0700
i915: use WC mapping for framebuffer screen_base
commit 241ff808b0f7368e3988d51d2ea3775adb75b6f4
-Merge: 4a2e29b... 7010d50...
+Merge: 4a2e29b 7010d50
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Wed Jun 18 14:01:47 2008 -0700
@@ -5287,7 +5880,7 @@ Date: Wed Jun 11 11:28:20 2008 -0700
They are not unnecessary since the kernel's the only thing touching the ring.
commit f5412a944fa4666e25f4fa27b6ed85c21ccb65a0
-Merge: a1d9600... 62a3be9...
+Merge: a1d9600 62a3be9
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Wed Jun 11 10:25:45 2008 -0700
@@ -5329,7 +5922,7 @@ Date: Tue Jun 10 22:18:14 2008 -0700
xgixp: Remove dependency on TTM fences
commit a1d96007241a78dd2b4a718df8e0568fe7994c22
-Merge: c987e76... 500c81d...
+Merge: c987e76 500c81d
Author: Jesse Barnes <jbarnes@hobbes.lan>
Date: Tue Jun 10 17:31:54 2008 -0700
@@ -5561,7 +6154,7 @@ Date: Fri Jun 6 15:38:53 2008 +1000
intel: don't set the mode on the framebuffer if isn't set to scanout our framebuffer
commit ec774e4d7201cf875a48cd2fb799e8e5b7f30cc8
-Merge: be501f0... 03bf1fb...
+Merge: be501f0 03bf1fb
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Jun 6 15:21:57 2008 +1000
@@ -5951,7 +6544,7 @@ Date: Sun Jun 1 16:17:31 2008 -0400
[FreeBSD] Get rid of vbl_lock and re-use irq_lock.
commit eba6cdc936cb33d929997ccb9bade6f75bb40670
-Merge: efb48c6... 7fec6c0...
+Merge: efb48c6 7fec6c0
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jun 2 12:58:10 2008 +1000
@@ -6020,7 +6613,7 @@ Date: Fri May 30 18:20:01 2008 -0400
RADEON: fix typo in last commit
commit 461bfa3da6f85b85c21cd84f81bb4eefa5481418
-Merge: 50bce2b... 6e8a2cf...
+Merge: 50bce2b 6e8a2cf
Author: Eric Anholt <eric@anholt.net>
Date: Fri May 30 14:42:08 2008 -0700
@@ -6224,7 +6817,7 @@ Date: Thu May 29 13:58:26 2008 +1000
as I'm going to break it.
Reply to: