Pauli Nieminen [Wed, 10 Mar 2010 11:35:59 +0000 (13:35 +0200)]
libdrm: Move intel_atomic.h to libdrm core for sharing.
intel_atomic.h includes very usefull atomic operations for
lock free parrallel access of variables. Moving these to
core libdrm for code sharing with radeon.
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
Francisco Jerez [Sat, 13 Mar 2010 17:55:09 +0000 (18:55 +0100)]
nouveau: Fix up the stride of NV20TCL_LIGHT_BACK_*.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Francisco Jerez [Sun, 7 Mar 2010 17:56:42 +0000 (18:56 +0100)]
nouveau: Small lighting related addition to nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Chris Wilson [Sun, 7 Mar 2010 14:15:40 +0000 (14:15 +0000)]
intel: Repeat execbuffer if interrupted by signal
Repeat while EINTR, not EAGAIN! One more source of corruption
erradicated, hurray!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Francisco Jerez [Sat, 6 Mar 2010 20:07:31 +0000 (21:07 +0100)]
nouveau: Update nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Eric Anholt [Fri, 5 Mar 2010 00:09:40 +0000 (16:09 -0800)]
intel: Only align Y-tiling pitch to the Y tile width.
Fixes piglit depth-tex-modes on gen4.
Chris Wilson [Thu, 4 Mar 2010 21:17:48 +0000 (21:17 +0000)]
intel: Propagate some more error returns
Ensure that errors from the kernel are propagated back to the caller,
and not masked with return 0;
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Eric Anholt [Wed, 3 Mar 2010 19:10:54 +0000 (11:10 -0800)]
Increment version to 2.4.19 for release.
The primary motivation of this release is to expose the new execbuf2
Intel API.
Eric Anholt [Wed, 3 Mar 2010 18:07:27 +0000 (10:07 -0800)]
intel: Update the needs_fence flag of buffers on the validate list.
Fixes fbo-copyteximage on i915 with texture tiling and execbuf2 fenced
relocs.
Eric Anholt [Wed, 3 Mar 2010 00:04:14 +0000 (16:04 -0800)]
intel: Don't enable execbuf2 fenced relocs unless we have execbuf2.
Eric Anholt [Tue, 2 Mar 2010 23:25:42 +0000 (15:25 -0800)]
intel: Don't tile-align pitch for untiled buffers.
This allows Mesa to use drm_intel_bo_alloc_tiled() for its tiled
buffers, since it makes its decision about pitch before telling
libdrm. They happen to be the same choices for the tiled case.
Eric Anholt [Tue, 2 Mar 2010 23:24:50 +0000 (15:24 -0800)]
intel: Fix typo in conversion from IS_GEN to bufmgr_gem->gen.
Luckily I caught the bug with the first consumer of the interface.
Eric Anholt [Tue, 2 Mar 2010 23:05:30 +0000 (15:05 -0800)]
intel: add a comment about tiled buffer alloc height alignment from Mesa.
Maarten Maathuis [Wed, 24 Feb 2010 22:10:34 +0000 (23:10 +0100)]
nouveau: make sure initial kalloc for user bo ends up in the right place
- Currently reloc'ing a user bo to gart will first cause an allocation in vram,
which is then written to by cpu, then the bo gets moved to gart.
Acked-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Eric Anholt [Tue, 2 Mar 2010 16:49:36 +0000 (08:49 -0800)]
intel: Use an integer for chipset generation instead of many conditionals.
Saves a bunch of comparisons in hot paths.
Jesse Barnes [Tue, 15 Sep 2009 18:02:58 +0000 (11:02 -0700)]
libdrm/intel: execbuf2 support
This patch to libdrm adds support for the new execbuf2 ioctl. If
detected, it will be used instead of the old ioctl. By using the new
drm_intel_bufmgr_gem_enable_fenced_relocs(), you can indicate that any
time a fence register is actually required for a relocation target you
will call drm_intel_bo_emit_reloc_fence instead of
drm_intel_bo_emit_reloc, which will reduce fence register pressure.
Signed-off-by: Eric Anholt <eric@anholt.net>
Marcin Kościelnicki [Sat, 27 Feb 2010 15:04:40 +0000 (15:04 +0000)]
tests/modetest: Don't get_props on a connector after freeing it.
Marcin Kościelnicki [Sat, 27 Feb 2010 15:04:42 +0000 (15:04 +0000)]
tests: vrefresh is actually not * 1000.
Marcin Kościelnicki [Sat, 27 Feb 2010 15:04:41 +0000 (15:04 +0000)]
tests: Add nouveau to list of supported modules.
Marcin Kościelnicki [Sat, 27 Feb 2010 16:02:25 +0000 (16:02 +0000)]
libkms/nouveau: Add support
Marcin Kościelnicki [Sat, 27 Feb 2010 15:04:38 +0000 (15:04 +0000)]
libkms/intel: Throw out unused intel_bo fields.
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Marcin Kościelnicki [Sat, 27 Feb 2010 15:04:37 +0000 (15:04 +0000)]
Add config.h macro HAVE_NOUVEAU
Eric Anholt [Thu, 22 Oct 2009 23:37:56 +0000 (16:37 -0700)]
intel: Add initial support for Sandybridge, and clean up the #defines.
Francisco Jerez [Thu, 25 Feb 2010 17:28:18 +0000 (18:28 +0100)]
nouveau: Update nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Patrice Mandin [Sat, 20 Feb 2010 10:57:29 +0000 (11:57 +0100)]
nv30: update for 8 texture units
Patrice Mandin [Sat, 20 Feb 2010 10:50:37 +0000 (11:50 +0100)]
nv30: update for front/back stencil inversion
Signed-off-by: Patrice Mandin <patmandin@gmail.com>
Jakob Bornecrantz [Thu, 18 Feb 2010 15:29:36 +0000 (16:29 +0100)]
libkms: Use a standard version number
Jakob Bornecrantz [Thu, 18 Feb 2010 12:27:29 +0000 (13:27 +0100)]
libkms: Enable by default
Jakob Bornecrantz [Thu, 18 Feb 2010 12:14:07 +0000 (13:14 +0100)]
libkms: Add missing include file to libkms source
Jakob Bornecrantz [Thu, 18 Feb 2010 12:27:59 +0000 (13:27 +0100)]
vmwgfx: Update kernel header
Marek Olšák [Sun, 14 Feb 2010 16:57:19 +0000 (17:57 +0100)]
radeon: add square-tiling flag
Carl Worth [Tue, 16 Feb 2010 20:12:41 +0000 (12:12 -0800)]
Increment version to 2.4.18 for release.
The primary motivation of the release is the bug fix in commit
4f0f871730b76730ca58209181d16725b0c40184
Ben Skeggs [Tue, 16 Feb 2010 05:42:00 +0000 (15:42 +1000)]
nouveau: bump MAX_PUSH to 512
Luca Barbieri [Fri, 29 Jan 2010 08:53:24 +0000 (09:53 +0100)]
nouveau: interface changes for 0.0.16 DRM
This commit encompasses the changes necessary to run on top of the 0.0.16
nouveau interface, additional APIs to support the new features of the
interface, as well as code from Luca Barbieri to improve the pushbuf
interface, which just happens to break nouveau's libdrm ABI so was delayed
until now.
API changes as a result of 0.0.16 DRM interface:
1. No more bo_pin()/bo_unpin(), these were only there for UMS and we no
longer support it.
2. Any random nouveau_bo can be submitted to the GPU as a push buffer.
3. Relocations can be applied on any nouveau_bo
This patch changes the pushbuffer ABI to:
1. No longer use/expose nouveau_pushbuffer. Everything is directly
in nouveau_channel. This saves the extra "pushbuf" pointer dereference.
2. Use cur/end pointers instead of tracking the remaining size.
Pushing data now only needs to alter cur and not both cur and remaining.
The goal is to make the *_RING macros faster and make the interface simpler
and cleaner in the process.
The *_RING APIs are unchanged, but those are inlined and the ABI is changed.
Also, anything accessing pushbuf->remaining instead of using AVAIL_RING
will need to be fixed.
Alex Deucher [Thu, 11 Feb 2010 00:39:46 +0000 (19:39 -0500)]
drm: a some new connector types from the kernel
Add eDP (embedded displayport) and generic TV
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Chris Wilson [Wed, 10 Feb 2010 09:45:13 +0000 (09:45 +0000)]
intel: Handle resetting of input params after EINTR during SET_TILING
The SET_TILING is pernicious in that it overwrites the input arguments
following an error in order to report the current tiling state of the
buffer. This caught us by surprise as we then fed those arguments back
into to the ioctl unmodified following an EINTR and so the kernel then
reported success for the no-op. We interpreted this success as meaning
that the tiling on the buffer had changed so updated our state and
started using the buffer incorrectly in the new tiled/untiled manner.
This lead to all sorts of random corruption and GPU hangs, even though
the batch buffers would look sane (when the GPU had not wandered off
into forbidden territory).
References:
Bug 25475 - [i915] Xorg crash / Execbuf while wedged
http://bugs.freedesktop.org/show_bug.cgi?id=25475
Bug 25554 - i830_uxa_prepare_access: gtt bo map failed: Input/output error
http://bugs.freedesktop.org/show_bug.cgi?id=25554
(And probably every other weird bug in the last few months.)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Chris Wilson [Tue, 9 Feb 2010 08:32:54 +0000 (08:32 +0000)]
intel: Account for potential pinned buffers hogging fences
As the kernel reports the total number of fences, we must guess how many
fences are likely to be pinned. In the typical system these will be only
used by the scanout buffers, of which there may be one per pipe, and any
number of manually pinned fenced buffers. So take a conservative guess
and reserve two fences for use by the system.
Note this reduces the number of fences to 3 for i915 and prior.
Reference:
http://bugs.freedesktop.org/show_bug.cgi?id=25911
The latest intel driver 2.10.0 causes kernel oops and system hangs
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Matthew W. S. Bell [Sat, 30 Jan 2010 02:14:44 +0000 (02:14 +0000)]
Tidy up compile warnings by cleaning up types.
Pauli Nieminen [Mon, 1 Feb 2010 18:19:33 +0000 (20:19 +0200)]
libdrm/radeon: Fix section size mismatch to reset the section.
If there is section size mismatch reusing the section object
makes section start fail.
Reseting the object before doing error checking prevents the
possible flood of errors.
Dave Airlie [Tue, 2 Feb 2010 00:58:50 +0000 (10:58 +1000)]
radeon: enable by default now that kms is out of staging
Dave Airlie [Tue, 2 Feb 2010 00:57:12 +0000 (10:57 +1000)]
intel: check return value for calloc
Francisco Jerez [Sun, 31 Jan 2010 16:47:50 +0000 (17:47 +0100)]
nouveau: Regenerate nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Marcin Slusarz [Tue, 12 Jan 2010 14:31:28 +0000 (15:31 +0100)]
nouveau: add nouveau_resource_destroy
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Jakob Bornecrantz [Sat, 23 Jan 2010 01:41:49 +0000 (01:41 +0000)]
libkms: Rework interface to not duplicate fields from kms and make formats explicit
List of changes:
Fixes the cursor size to 64x64, you still need ti supply width and height
Explicitly make the cursor format A8R8G8B8
Explicitly make the scanout format X8R8G8B8
Marcin Kościelnicki [Tue, 26 Jan 2010 18:39:21 +0000 (18:39 +0000)]
nouveau: Update nouveau_drm.h
Jakob Bornecrantz [Sat, 23 Jan 2010 01:38:18 +0000 (01:38 +0000)]
libkms: Fix return value in vmwgfx_bo_create
Ben Skeggs [Thu, 21 Jan 2010 05:17:26 +0000 (15:17 +1000)]
nouveau: fail channel creation if pushbuf init fails
Chris Wilson [Wed, 20 Jan 2010 10:42:46 +0000 (10:42 +0000)]
intel: Add pkg-config dependency on libdrm.so using 'Requires'
Alan Coopersmith [Sun, 17 Jan 2010 03:34:13 +0000 (19:34 -0800)]
Support gcc's __FUNCTION__ for people using other compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Alan Coopersmith [Sun, 17 Jan 2010 03:28:50 +0000 (19:28 -0800)]
Add support for Solaris libc atomic operations
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Alan Coopersmith [Wed, 16 Dec 2009 23:03:58 +0000 (15:03 -0800)]
Include alloca.h in tests/drmstat.c when configure detects it
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Marcin Slusarz [Tue, 12 Jan 2010 14:38:29 +0000 (15:38 +0100)]
nouveau: disable flush_notify on channel_free
We don't want do call flush_notify when we will FIRE the RING
a couple of lines later, because grobj bound to this channel
might be already freed.
Marcin Slusarz [Tue, 12 Jan 2010 14:32:39 +0000 (15:32 +0100)]
nouveau: fix memory leak in nouveau_channel_free
Jakob Bornecrantz [Fri, 15 Jan 2010 20:13:20 +0000 (20:13 +0000)]
libkms: Fix multiple map unmap in vmwgfx and add comment in intel
Jerome Glisse [Thu, 14 Jan 2010 19:01:55 +0000 (20:01 +0100)]
radeon: get device id from the kernel, use it in cs_print
This allow external tools to know for which asics a cs
is destinated to.
Jerome Glisse [Thu, 14 Jan 2010 11:28:20 +0000 (12:28 +0100)]
radeon: simpler cs print function
We don't intend libdrm-radeon to become clever enough to
decode cs for all GPU we support. Better to let an external
tool do the job. This will print raw cs in an easy to parse
way.
Jerome Glisse [Thu, 14 Jan 2010 10:28:25 +0000 (11:28 +0100)]
radeon: indentation + trailing space cleanup
Jerome Glisse [Thu, 14 Jan 2010 10:24:16 +0000 (11:24 +0100)]
radeon: indentation & trailing space cleanup
Jerome Glisse [Thu, 14 Jan 2010 10:08:43 +0000 (11:08 +0100)]
radeon: indentation + trailing space cleanup
Jakob Bornecrantz [Tue, 12 Jan 2010 21:35:28 +0000 (22:35 +0100)]
tests: Update kmstest a bit
Jakob Bornecrantz [Tue, 12 Jan 2010 17:53:49 +0000 (17:53 +0000)]
libkms: Use sysfs instead of udev to find driver
Udev code is still there just commented out.
Jakob Bornecrantz [Fri, 8 Jan 2010 15:34:44 +0000 (15:34 +0000)]
tests: Add a very small libkms test
Jakob Bornecrantz [Fri, 8 Jan 2010 15:19:44 +0000 (15:19 +0000)]
libkms/intel: Don't fail to create bo if we fail to tile
Francisco Jerez [Fri, 8 Jan 2010 03:34:39 +0000 (04:34 +0100)]
nouveau: Update nouveau_class.h.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Jakob Bornecrantz [Fri, 8 Jan 2010 03:00:56 +0000 (03:00 +0000)]
libkms: Add intel backend
Jakob Bornecrantz [Fri, 8 Jan 2010 02:51:04 +0000 (02:51 +0000)]
libkms: Pick driver backend via pci id that we get from udev
Peter Clifton [Wed, 6 Jan 2010 20:44:11 +0000 (20:44 +0000)]
modes: Retry GETCONNECTOR if a hotplug event occurs between the two ioctls
If the available modes changes between the two GETCONNECTOR ioctls, that
caused the kernel to skip filling one array and led to a crash (as the size
of the allocated and initialised block of memory differed from the reported
size, and might be NULL if no modes were present at first).
This bug manifest its self on my machine due to spurious false positive
detections of a connected TV-out.
Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=25912
Crash whilst probing modes
Based upon the similar fixes for the GETRESOURCES ioctls by Chris Wilson,
in the following commits:
commit
e6c136ca7a4c54457b48be1aec2be024b3e4a28d
commit
85fb3e55fdb7af9b5f59c1ec0f15d1950e601b05
commit
d1308f4fe7f94aae51ca9f70947aea8e09597f37
Signed-off-by: Peter Clifton <pcjc2@cam.ac.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Chris Wilson [Wed, 6 Jan 2010 16:53:33 +0000 (16:53 +0000)]
modes: Fix previous commit for potential legal NULLs
If the count is 0, then the malloc is permitted to return NULL, so don't
throw an error in that case.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Chris Wilson [Wed, 6 Jan 2010 15:39:49 +0000 (15:39 +0000)]
modes: Free local resources after allocation failure in GETRESOURCES
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Chris Wilson [Wed, 6 Jan 2010 15:19:25 +0000 (15:19 +0000)]
modes: Retry GETRESOURCES if a hotplug event occurs between the two ioctls
Peter Clifton hit an issue whereby he had a spurious TV hotplug event
that occurred between the two GETRESOURCES ioctls that caused the kernel
to skip filling one array and led to a crash (as the size of the
allocated and initialised block of memory differed from the reported
size).
Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=25912
Crash whilst probing modes
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reported-by: Peter Clifton <pcjc2@cam.ac.uk>
Jakob Bornecrantz [Tue, 5 Jan 2010 19:55:02 +0000 (20:55 +0100)]
libkms: Make vmwgfx optional
Jakob Bornecrantz [Tue, 5 Jan 2010 20:04:57 +0000 (21:04 +0100)]
libkms: Remove duped vmwgfx_drm.h header
Jakob Bornecrantz [Tue, 5 Jan 2010 19:59:24 +0000 (20:59 +0100)]
Merge branch 'master' into libkms-master
Conflicts:
configure.ac
Jakob Bornecrantz [Tue, 5 Jan 2010 19:58:37 +0000 (20:58 +0100)]
libkms: Disable by default
Jakob Bornecrantz [Tue, 5 Jan 2010 18:53:10 +0000 (19:53 +0100)]
vmwgfx: Add experimental vmwgfx kernel header
Marcin Slusarz [Wed, 30 Dec 2009 20:32:40 +0000 (21:32 +0100)]
nouveau: add BEGIN_RING_NI
Younes Manton [Mon, 28 Dec 2009 23:00:09 +0000 (18:00 -0500)]
nouveau: Unreference pushbuf objects on channel destruction.
- unreference pushbuf objects on channel destruction
Based on Krzysztof Smiechowicz's patch.
Francisco Jerez [Mon, 28 Dec 2009 17:01:42 +0000 (18:01 +0100)]
nouveau: Update some object definitions from renouveau.xml.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Marcin Kościelnicki [Tue, 24 Nov 2009 17:23:54 +0000 (17:23 +0000)]
nouveau: Update nouveau_class.h with new renouveau.xml definitions.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Dave Airlie [Mon, 21 Dec 2009 05:03:31 +0000 (15:03 +1000)]
libdrm 2.4.17
Dave Airlie [Mon, 21 Dec 2009 04:59:48 +0000 (14:59 +1000)]
radeon: fix BO null check, should be in higher level fn
Dave Airlie [Thu, 17 Dec 2009 04:11:55 +0000 (14:11 +1000)]
radeon: straighten out the API insanity.
as Michel pointed out we are exposing too much info for these object
for this to be maintainable going forward.
This patch set minimises the exposed parts of the radeon_bo and
radeon_cs objects to the piece necessary for ddx/mesa to operate
at a decent speed.
The major problem is mesa contains a legacy BO/CS managers which we still
need to expose functionality to, and we really cannot change the API
until we can drop the non-KMS codepaths.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Ben Skeggs [Thu, 17 Dec 2009 03:07:18 +0000 (13:07 +1000)]
nouveau: remove delayed kernel bo creation
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Kristian Høgsberg [Wed, 9 Dec 2009 15:37:40 +0000 (10:37 -0500)]
Be less chatty in drmSetMaster/drmDropMaster
Kristian Høgsberg [Wed, 9 Dec 2009 15:36:53 +0000 (10:36 -0500)]
modetest: Error out if pageflipping is requested but not available
Jakob Bornecrantz [Mon, 14 Dec 2009 21:53:10 +0000 (22:53 +0100)]
vmwgfx: Fetch the latest header
Ben Skeggs [Wed, 9 Dec 2009 04:50:15 +0000 (14:50 +1000)]
nouveau: Use drmIoctl so we restart ioctl on EINTR or EAGAIN
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs [Wed, 9 Dec 2009 03:15:07 +0000 (13:15 +1000)]
nouveau: move reloc code down, nothing to see here
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Chris Wilson [Tue, 8 Dec 2009 22:35:24 +0000 (22:35 +0000)]
intel: Clear virtual after failing to mmap_gtt.
Don't store the error return in bo_gem->gtt_virtual or else we will
attempt to use that as a valid pointer in future mappings.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Jakob Bornecrantz [Fri, 4 Dec 2009 15:06:42 +0000 (16:06 +0100)]
libkms: Change destroy api a bit
Jakob Bornecrantz [Tue, 24 Nov 2009 16:54:10 +0000 (17:54 +0100)]
libkms: Add libkms
Jakob Bornecrantz [Fri, 4 Dec 2009 15:07:51 +0000 (16:07 +0100)]
Ignore config.h.in
Jerome Glisse [Mon, 7 Dec 2009 17:30:52 +0000 (18:30 +0100)]
radeon: Use drmIoctl so we restart ioctl on EINTR or EAGAIN
This is needed as change in kernel will lead to ioctl returning
EINTR if they are interrupted.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Chris Wilson [Tue, 1 Dec 2009 23:01:34 +0000 (23:01 +0000)]
intel: Expect caller to guarantee thread-safety of bo during reloc
This removes the foremost prolific user of mutexes in libdrm_intel.so.
The other uses of the bufmgr_gem->mutex to serial access to individual
bos are currently required by Mesa, and are far less frequent.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[anholt: This chunk looks good...]
Acked-by: Eric Anholt <eric@anholt.net>
Jesse Barnes [Fri, 4 Dec 2009 17:09:19 +0000 (09:09 -0800)]
modetest: fix build error due to page_flip_handler name change
Forgot to update this when pushing the pageflip bits.
Jakob Bornecrantz [Wed, 2 Dec 2009 18:40:58 +0000 (19:40 +0100)]
Merge branch 'modesetting-dirty-libdrm'
Conflicts:
include/drm/drm.h
Kristian Høgsberg [Thu, 3 Dec 2009 22:49:31 +0000 (17:49 -0500)]
Add RELEASING to document the release process
Jesse Barnes [Thu, 3 Dec 2009 22:20:51 +0000 (14:20 -0800)]
Bump event context structure version for page flipping
Jesse Barnes [Thu, 3 Dec 2009 22:17:26 +0000 (14:17 -0800)]
Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drm
Conflicts:
include/drm/drm.h - RMFB had its signature changed to avoid uint32_t
Kristian Høgsberg [Thu, 3 Dec 2009 16:31:27 +0000 (11:31 -0500)]
Bump to 2.4.16 for release