diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-07-26 10:35:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-07-26 10:35:44 +1000 |
| commit | 2536f7dc42556f63ee45b14e7d2d9696200f317a (patch) | |
| tree | 8d920a5a95a561db6fa5933953ee5b5dff140c12 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | fcedac670c3da0d17aaa5db1708694971e8024a9 (diff) | |
| parent | 715855457e6bc93e148caf8cb3b5dcabbf605b0d (diff) | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: init vblank requests list
drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
drm/nouveau: move current gpuobj code out of nouveau_object.c
drm/nouveau/gem: fix object reference leak in a failure path
drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
drm/nv84: decode PCRYPT errors
drm/nouveau: dcb table quirk for fdo#50830
nouveau: Fix alignment requirements on src and dst addresses
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
0 files changed, 0 insertions, 0 deletions