diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-07 12:22:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-07 12:22:10 +1000 |
| commit | 212c444baa4efe0077fb2a07a65ccb3011b94e8f (patch) | |
| tree | b8892c347a6901dd711f0ba01dc5bc41ce7ad80b /lib | |
| parent | 1e95ab5846504b2c0e9a01405bbb3278e2e20480 (diff) | |
| parent | 59c8e66378fb78adbcd05f0d09783dde6fef282b (diff) | |
Merge branch 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next
- A couple of fixes that never made it into fixes-3.12
- Make NO_EVICT bo's available for shrinkers when on delayed-delete list
- Allow retrying page-faults that need to wait for GPU.
* 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux:
drm/ttm: Fix memory type compatibility check
drm/ttm: Fix ttm_bo_move_memcpy
drm/ttm: Handle in-memory region copies
drm/ttm: Make NO_EVICT bos available to shrinkers pending destruction
drm/ttm: Allow vm fault retries
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions