Attachment 98501 Details for Bug 78297 – Possible fix.

[patch] Possible fix.

0001-drm-radeon-also-try-GART-for-CPU-accessed-buffers.patch (text/plain), 2.38 KB, created by Christian König on 2014-05-05 16:45:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2014-05-05 16:45:47 UTC

Size: 2.38 KB

patch

obsolete

>From e8d0b3965b96d3d44af4b729f120893375b428cf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Mon, 5 May 2014 18:40:12 +0200
>Subject: [PATCH] drm/radeon: also try GART for CPU accessed buffers
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Placing them exclusively into VRAM might not work all the time.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/radeon/radeon_object.c | 38 ++++++++++++++++++++--------------
> 1 file changed, 23 insertions(+), 15 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
>index 19bec0d..72705fb 100644
>--- a/drivers/gpu/drm/radeon/radeon_object.c
>+++ b/drivers/gpu/drm/radeon/radeon_object.c
>@@ -699,22 +699,30 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
> 	rbo = container_of(bo, struct radeon_bo, tbo);
> 	radeon_bo_check_tiling(rbo, 0, 0);
> 	rdev = rbo->rdev;
>-	if (bo->mem.mem_type == TTM_PL_VRAM) {
>-		size = bo->mem.num_pages << PAGE_SHIFT;
>-		offset = bo->mem.start << PAGE_SHIFT;
>-		if ((offset + size) > rdev->mc.visible_vram_size) {
>-			/* hurrah the memory is not visible ! */
>-			radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_VRAM);
>-			rbo->placement.lpfn = rdev->mc.visible_vram_size >> PAGE_SHIFT;
>-			r = ttm_bo_validate(bo, &rbo->placement, false, false);
>-			if (unlikely(r != 0))
>-				return r;
>-			offset = bo->mem.start << PAGE_SHIFT;
>-			/* this should not happen */
>-			if ((offset + size) > rdev->mc.visible_vram_size)
>-				return -EINVAL;
>-		}
>+	if (bo->mem.mem_type != TTM_PL_VRAM)
>+		return 0;
>+
>+	size = bo->mem.num_pages << PAGE_SHIFT;
>+	offset = bo->mem.start << PAGE_SHIFT;
>+	if ((offset + size) <= rdev->mc.visible_vram_size)
>+		return 0;
>+
>+	/* hurrah the memory is not visible ! */
>+	radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_VRAM);
>+	rbo->placement.lpfn = rdev->mc.visible_vram_size >> PAGE_SHIFT;
>+	r = ttm_bo_validate(bo, &rbo->placement, false, false);
>+	if (unlikely(r == -ENOMEM)) {
>+		radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);
>+		return ttm_bo_validate(bo, &rbo->placement, false, false);
>+	} else if (unlikely(r != 0)) {
>+		return r;
> 	}
>+
>+	offset = bo->mem.start << PAGE_SHIFT;
>+	/* this should never happen */
>+	if ((offset + size) > rdev->mc.visible_vram_size)
>+		return -EINVAL;
>+
> 	return 0;
> }
> 
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 78297: 98475 | 98480 | 98482 | 98499 | 98501

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.