Attachment 107544 Details for Bug 84662 – drm/radeon: Try placing NO_CPU_ACCESS BOs outside of CPU accessible VRAM

[patch] drm/radeon: Try placing NO_CPU_ACCESS BOs outside of CPU accessible VRAM

radeon-NO_CPU_ACCESS-placement.diff (text/plain), 2.88 KB, created by Michel Dänzer on 2014-10-08 08:06:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2014-10-08 08:06:44 UTC

Size: 2.88 KB

patch

obsolete

>commit cdb0579ed2396798baadc52aa600604200be27c8
>Author: Michel DÃ¤nzer <michel.daenzer@amd.com>
>Date:   Wed Oct 8 16:39:20 2014 +0900
>
>    drm/radeon: Try placing NO_CPU_ACCESS BOs outside of CPU accessible VRAM
>
>diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
>index 99a960a..3d3026d 100644
>--- a/drivers/gpu/drm/radeon/radeon_object.c
>+++ b/drivers/gpu/drm/radeon/radeon_object.c
>@@ -99,22 +99,36 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
> 
> 	rbo->placement.placement = rbo->placements;
> 	rbo->placement.busy_placement = rbo->placements;
>-	if (domain & RADEON_GEM_DOMAIN_VRAM)
>+	if (domain & RADEON_GEM_DOMAIN_VRAM) {
>+		if ((rbo->flags & RADEON_GEM_NO_CPU_ACCESS) &&
>+		    rbo->rdev->mc.visible_vram_size < rbo->rdev->mc.real_vram_size) {
>+			rbo->placements[c].fpfn =
>+				rbo->rdev->mc.visible_vram_size >> PAGE_SHIFT;
>+			rbo->placements[c++].flags = TTM_PL_FLAG_WC |
>+						     TTM_PL_FLAG_UNCACHED |
>+						     TTM_PL_FLAG_VRAM;
>+		}
>+
>+		rbo->placements[c].fpfn = 0;
> 		rbo->placements[c++].flags = TTM_PL_FLAG_WC |
> 					     TTM_PL_FLAG_UNCACHED |
> 					     TTM_PL_FLAG_VRAM;
>+	}
> 
> 	if (domain & RADEON_GEM_DOMAIN_GTT) {
> 		if (rbo->flags & RADEON_GEM_GTT_UC) {
>+			rbo->placements[c].fpfn = 0;
> 			rbo->placements[c++].flags = TTM_PL_FLAG_UNCACHED |
> 				TTM_PL_FLAG_TT;
> 
> 		} else if ((rbo->flags & RADEON_GEM_GTT_WC) ||
> 			   (rbo->rdev->flags & RADEON_IS_AGP)) {
>+			rbo->placements[c].fpfn = 0;
> 			rbo->placements[c++].flags = TTM_PL_FLAG_WC |
> 				TTM_PL_FLAG_UNCACHED |
> 				TTM_PL_FLAG_TT;
> 		} else {
>+			rbo->placements[c].fpfn = 0;
> 			rbo->placements[c++].flags = TTM_PL_FLAG_CACHED |
> 						     TTM_PL_FLAG_TT;
> 		}
>@@ -122,30 +136,35 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
> 
> 	if (domain & RADEON_GEM_DOMAIN_CPU) {
> 		if (rbo->flags & RADEON_GEM_GTT_UC) {
>+			rbo->placements[c].fpfn = 0;
> 			rbo->placements[c++].flags = TTM_PL_FLAG_UNCACHED |
> 				TTM_PL_FLAG_SYSTEM;
> 
> 		} else if ((rbo->flags & RADEON_GEM_GTT_WC) ||
> 		    rbo->rdev->flags & RADEON_IS_AGP) {
>+			rbo->placements[c].fpfn = 0;
> 			rbo->placements[c++].flags = TTM_PL_FLAG_WC |
> 				TTM_PL_FLAG_UNCACHED |
> 				TTM_PL_FLAG_SYSTEM;
> 		} else {
>+			rbo->placements[c].fpfn = 0;
> 			rbo->placements[c++].flags = TTM_PL_FLAG_CACHED |
> 						     TTM_PL_FLAG_SYSTEM;
> 		}
> 	}
>-	if (!c)
>+	if (!c) {
>+		rbo->placements[c].fpfn = 0;
> 		rbo->placements[c++].flags = TTM_PL_MASK_CACHING |
> 					     TTM_PL_FLAG_SYSTEM;
>+	}
> 
> 	rbo->placement.num_placement = c;
> 	rbo->placement.num_busy_placement = c;
> 
> 	for (i = 0; i < c; ++i) {
>-		rbo->placements[i].fpfn = 0;
> 		if ((rbo->flags & RADEON_GEM_CPU_ACCESS) &&
>-		    (rbo->placements[i].flags & TTM_PL_FLAG_VRAM))
>+		    (rbo->placements[i].flags & TTM_PL_FLAG_VRAM) &&
>+		    !rbo->placements[i].fpfn)
> 			rbo->placements[i].lpfn =
> 				rbo->rdev->mc.visible_vram_size >> PAGE_SHIFT;
> 		else

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.