| author | Dave Airlie <airlied@redhat.com> | |
| Thu, 26 Jul 2012 00:35:44 +0000 (10:35 +1000) | ||
| committer | Dave Airlie <airlied@redhat.com> | |
| Thu, 26 Jul 2012 00:35:44 +0000 (10:35 +1000) |
* '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
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
| 1 | 2 | |||
|---|---|---|---|---|
| drivers/gpu/drm/nouveau/nouveau_drv.c | patch | | diff1 | | diff2 | | blob | history |
| drivers/gpu/drm/nouveau/nouveau_gem.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/gpu/drm/nouveau/nouveau_drv.c
Simple merge
diff --cc drivers/gpu/drm/nouveau/nouveau_gem.c
Simple merge