From: Dave Airlie Date: Tue, 20 Apr 2010 04:15:09 +0000 (+1000) Subject: Merge branch 'drm-ttm-unmappable' into drm-core-next X-Git-Tag: v3.12-rc1~9790^2~104 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb;p=kernel%2Fkernel-generic.git 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 --- 7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c index 957d176,34be192..fb164ef --- a/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: