diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-15 12:24:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-15 12:24:40 +1000 |
| commit | 0846c728e20a0cd1e43fb75a3015f3b176a26466 (patch) | |
| tree | a65d8b3a8c4860f79f9bf634d13ff3405fb5e217 /block/blk-cgroup.c | |
| parent | ad40f83f5a89f6d723fd4db424b531f8dd7d3b49 (diff) | |
| parent | d2c7ab32ceb0737c1aba84765c555e0f73d3c935 (diff) | |
| download | op-kernel-dev-0846c728e20a0cd1e43fb75a3015f3b176a26466.zip op-kernel-dev-0846c728e20a0cd1e43fb75a3015f3b176a26466.tar.gz | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
- Page flipping fixes, with support for syncing them to vblank (finally...).
- Misc other general fixes
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
drm/nouveau/pwr: fix missing mutex unlock in a failure path
drm/nv40/therm: fix slowing down fan when pstate undefined
drm/nv11-: synchronise flips to vblank, unless async flip requested
drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
drm/nv10-: we no longer need to create nvsw object on user channels
drm/nouveau: always queue flips relative to kernel channel activity
drm/nouveau: there is no need to reserve/fence the new fb when flipping
drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
drm/nouveau: allow nouveau_fence_ref() to be a noop
drm/nvc8/mc: msi rearm is via the nvc0 method
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions
