From: Dave Airlie Date: Wed, 3 Sep 2014 00:12:24 +0000 (+1000) Subject: Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux... X-Git-Tag: firefly_0821_release~176^2~3035^2~72 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6ba59f3b5c977af2df3f9446f030f71e29d77dc1;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next Merge the move to generic fences for TTM using drivers. * 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux: drm/nouveau: use shared fences for readable objects drm/nouveau: Keep only a single list for validation. drm/ttm: use rcu in core ttm drm/vmwgfx: use rcu in vmw_user_dmabuf_synccpu_grab drm/radeon: use rcu waits in some ioctls drm/nouveau: use rcu in nouveau_gem_ioctl_cpu_prep drm/ttm: flip the switch, and convert to dma_fence drm/qxl: rework to new fence interface drm/nouveau: rework to new fence interface drm/vmwgfx: rework to new fence interface, v2 drm/vmwgfx: get rid of different types of fence_flags entirely drm/radeon: use common fence implementation for fences, v4 drm/ttm: kill off some members to ttm_validate_buffer drm/ttm: add interruptible parameter to ttm_eu_reserve_buffers drm/ttm: kill fence_lock drm/ttm: call ttm_bo_wait while inside a reservation drm/nouveau: require reservations for nouveau_fence_sync and nouveau_bo_fence drm/nouveau: add reservation to nouveau_gem_ioctl_cpu_prep --- 6ba59f3b5c977af2df3f9446f030f71e29d77dc1