diff mbox

radeon: fix regression with eviction since evict caching changes

Message ID 1355483086-12447-1-git-send-email-airlied@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dave Airlie Dec. 14, 2012, 11:04 a.m. UTC 
From: Dave Airlie <airlied@redhat.com>

Since 0d0b3e7443bed6b49cb90fe7ddc4b5578a83a88d
drm/radeon: use cached memory when evicting for vram on non agp

evicting from TTM would try and evict to TTM instead of system,
not so good.

This should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=58272

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_object.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Maarten Lankhorst Dec. 14, 2012, 11:22 a.m. UTC | #1 
Op 14-12-12 12:04, Dave Airlie schreef:
> From: Dave Airlie <airlied@redhat.com>
>
> Since 0d0b3e7443bed6b49cb90fe7ddc4b5578a83a88d
> drm/radeon: use cached memory when evicting for vram on non agp
>
> evicting from TTM would try and evict to TTM instead of system,
> not so good.
>
> This should fix:
> https://bugs.freedesktop.org/show_bug.cgi?id=58272
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Alex Deucher Dec. 14, 2012, 2:48 p.m. UTC | #2 
Added to my tree.  Thanks.

On Fri, Dec 14, 2012 at 6:22 AM, Maarten Lankhorst
<maarten.lankhorst@canonical.com> wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 93d3445..883c95d 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -96,9 +96,9 @@  void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
 	}
 	if (domain & RADEON_GEM_DOMAIN_CPU) {
 		if (rbo->rdev->flags & RADEON_IS_AGP) {
-			rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT;
+			rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_SYSTEM;
 		} else {
-			rbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_TT;
+			rbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM;
 		}
 	}
 	if (!c)