Merge branch 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next

Browse source

- 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

...

This commit is contained in:

Dave Airlie 2013-11-07 12:22:10 +10:00

parent 1e95ab5846 59c8e66378

commit 212c444baa

3 changed files with 102 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

46

drivers/gpu/drm/ttm/ttm_bo.c

View file

30

drivers/gpu/drm/ttm/ttm_bo_util.c

View file

62

drivers/gpu/drm/ttm/ttm_bo_vm.c

View file