Attachment 107451 Details for Bug 84662 – ttm: Don't evict BOs outside of requested placement range

[patch] ttm: Don't evict BOs outside of requested placement range

ttm-evict-range.diff (text/plain), 1.67 KB, created by Michel Dänzer on 2014-10-07 03:47:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2014-10-07 03:47:36 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>index b992ec3..e678737 100644
>--- a/drivers/gpu/drm/ttm/ttm_bo.c
>+++ b/drivers/gpu/drm/ttm/ttm_bo.c
>@@ -715,6 +715,7 @@ out:
> 
> static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
> 				uint32_t mem_type,
>+				const struct ttm_place *place,
> 				bool interruptible,
> 				bool no_wait_gpu)
> {
>@@ -726,8 +727,23 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
> 	spin_lock(&glob->lru_lock);
> 	list_for_each_entry(bo, &man->lru, lru) {
> 		ret = __ttm_bo_reserve(bo, false, true, false, NULL);
>-		if (!ret)
>+		if (!ret) {
>+			if (place && (place->fpfn || place->lpfn)) {
>+				struct drm_mm_node *mm_node = bo->mem.mm_node;
>+
>+				/* Don't evict this BO if it's outside of the
>+				 * requested placement range
>+				 */
>+				if (place->fpfn >= (mm_node->start + mm_node->size) ||
>+				    (place->lpfn && place->lpfn <= mm_node->start)) {
>+					__ttm_bo_unreserve(bo);
>+					ret = -EBUSY;
>+					continue;
>+				}
>+			}
>+
> 			break;
>+		}
> 	}
> 
> 	if (ret) {
>@@ -788,7 +804,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
> 			return ret;
> 		if (mem->mm_node)
> 			break;
>-		ret = ttm_mem_evict_first(bdev, mem_type,
>+		ret = ttm_mem_evict_first(bdev, mem_type, place,
> 					  interruptible, no_wait_gpu);
> 		if (unlikely(ret != 0))
> 			return ret;
>@@ -1230,7 +1246,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
> 	spin_lock(&glob->lru_lock);
> 	while (!list_empty(&man->lru)) {
> 		spin_unlock(&glob->lru_lock);
>-		ret = ttm_mem_evict_first(bdev, mem_type, false, false);
>+		ret = ttm_mem_evict_first(bdev, mem_type, NULL, false, false);
> 		if (ret) {
> 			if (allow_errors) {
> 				return ret;

Actions: View | Splinter Review

Attachments on bug 84662: 107325 | 107326 | 107327 | 107391 | 107438 | 107451 | 107493 | 107542 | 107543 | 107544 | 107560 | 107863 | 108866 | 111191 | 111966

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.