Merge tag 'ttm-next-2014-01-13' of git://people.freedesktop.org/~thomash/linux into drm-next

Browse source

Some code cleanup by Rashika Keria,
VM stuff for ttm:
-Use PFNMAP instead of MIXEDMAP where possible for performance
-Refuse to fault imported pages, an initial step to support dma-bufs
better from within TTM.
-Correctly set page mapping and -index members. These are needed in various
places in the vm subsystem that we are not using yet, but plan to use soonish:
For example unmap-mapping-range keeping COW pages, and dirty tracking
fbdefio style, but also for PCI memory.

ttm-next 2013-01-14 pull request

* tag 'ttm-next-2014-01-13' of git://people.freedesktop.org/~thomash/linux:
  drivers: gpu: Remove unused function in ttm_lock.c
  drivers: gpu: Mark function as static in ttm_bo_util.c
  drivers: gpu: Mark function as static in ttm_bo.c
  drm/ttm: Correctly set page mapping and -index members
  drm/ttm: Refuse to fault (prime-) imported pages
  drm/ttm: Use VM_PFNMAP for shared bo maps

...

This commit is contained in:

Dave Airlie 2014-01-14 10:46:19 +10:00

parent 99d4a8ae93 5202870412

commit a095c60bd0

6 changed files with 64 additions and 18 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

2

drivers/gpu/drm/ttm/ttm_bo.c

View file

4

drivers/gpu/drm/ttm/ttm_bo_util.c

View file

32

drivers/gpu/drm/ttm/ttm_bo_vm.c

View file

8

drivers/gpu/drm/ttm/ttm_lock.c

View file

27

drivers/gpu/drm/ttm/ttm_tt.c

View file

9

include/drm/ttm/ttm_bo_driver.h

View file