Merge branch 'drm-ttm-unmappable' into drm-core-next

* drm-ttm-unmappable:
  drm/radeon/kms: enable use of unmappable VRAM V2
  drm/ttm: remove io_ field from TTM V6
  drm/vmwgfx: add support for new TTM fault callback V5
  drm/nouveau/kms: add support for new TTM fault callback V5
  drm/radeon/kms: add support for new fault callback V7
  drm/ttm: ttm_fault callback to allow driver to handle bo placement V6
  drm/ttm: split no_wait argument in 2 GPU or reserve wait

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_bo.c

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
index 957d17629840254c1ccf5ad13139856cea232525,34be1924218f804d9de8fb2bcca62e4592ef3024..fb164efada3b29aecc9578c86c9f5aef53effdac
--- 1/drivers/gpu/drm/nouveau/nouveau_bo.c
--- 2/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@@ -223,9 -215,11 +223,9 @@@ nouveau_bo_pin(struct nouveau_bo *nvbo
        if (ret)
                goto out;
  
 -      nouveau_bo_placement_set(nvbo, memtype);
 -      for (i = 0; i < nvbo->placement.num_placement; i++)
 -              nvbo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
 +      nouveau_bo_placement_set(nvbo, memtype, 0);
  
-       ret = ttm_bo_validate(bo, &nvbo->placement, false, false);
+       ret = ttm_bo_validate(bo, &nvbo->placement, false, false, false);
        if (ret == 0) {
                switch (bo->mem.mem_type) {
                case TTM_PL_VRAM:
@@@ -259,9 -253,10 +259,9 @@@ nouveau_bo_unpin(struct nouveau_bo *nvb
        if (ret)
                return ret;
  
 -      for (i = 0; i < nvbo->placement.num_placement; i++)
 -              nvbo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
 +      nouveau_bo_placement_set(nvbo, bo->mem.placement, 0);
  
-       ret = ttm_bo_validate(bo, &nvbo->placement, false, false);
+       ret = ttm_bo_validate(bo, &nvbo->placement, false, false, false);
        if (ret == 0) {
                switch (bo->mem.mem_type) {
                case TTM_PL_VRAM:

diff --cc drivers/gpu/drm/nouveau/nouveau_gem.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r100.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_object.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv770.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo_util.c
Simple merge