Attachment 124616 Details for Bug 96588 – Possible fix

[patch] Possible fix

0001-drm-ttm-wait-for-eviction-in-ttm_bo_force_list_clean.patch (text/plain), 1.44 KB, created by Christian König on 2016-06-20 11:24:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2016-06-20 11:24:37 UTC

Size: 1.44 KB

patch

obsolete

>From 6c3714ad9b04cf8a6cd96cc6033c6c47e32cfcbd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Mon, 20 Jun 2016 13:17:10 +0200
>Subject: [PATCH] drm/ttm: wait for eviction in ttm_bo_force_list_clean
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Now that we can pipeline evictions we need to wait for
>them to finish when we cleanup a memory domain.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/ttm/ttm_bo.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
>diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>index 5d93169..e340d0d6 100644
>--- a/drivers/gpu/drm/ttm/ttm_bo.c
>+++ b/drivers/gpu/drm/ttm/ttm_bo.c
>@@ -1287,6 +1287,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
> {
> 	struct ttm_mem_type_manager *man = &bdev->man[mem_type];
> 	struct ttm_bo_global *glob = bdev->glob;
>+	struct fence *fence;
> 	int ret;
> 
> 	/*
>@@ -1307,6 +1308,23 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
> 		spin_lock(&glob->lru_lock);
> 	}
> 	spin_unlock(&glob->lru_lock);
>+
>+	spin_lock(&man->move_lock);
>+	fence = fence_get(man->move);
>+	spin_unlock(&man->move_lock);
>+
>+	if (fence) {
>+		ret = fence_wait(fence, false);
>+		fence_put(fence);
>+		if (ret) {
>+			if (allow_errors) {
>+				return ret;
>+			} else {
>+				pr_err("Cleanup eviction failed\n");
>+			}
>+		}
>+	}
>+
> 	return 0;
> }
> 
>-- 
>2.5.0
>

Actions: View | Splinter Review

Attachments on bug 96588: 124602 | 124607 | 124616 | 124623 | 124672 | 124708

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.