diff options
author | Dave Airlie <airlied@redhat.com> | 2012-12-14 06:04:46 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2012-12-14 10:45:28 -0500 |
commit | dd54fee7d440c4a9756cce2c24a50c15e4c17ccb (patch) | |
tree | a2ecda4e8167c94a31d22442360401418c2abab6 /drivers/gpu/drm/radeon/radeon_object.c | |
parent | 9d89d78e3a20980205966fba6345645547e59ceb (diff) |
radeon: fix regression with eviction since evict caching changes
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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 93d3445477be..883c95d8d90f 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) | |||
96 | } | 96 | } |
97 | if (domain & RADEON_GEM_DOMAIN_CPU) { | 97 | if (domain & RADEON_GEM_DOMAIN_CPU) { |
98 | if (rbo->rdev->flags & RADEON_IS_AGP) { | 98 | if (rbo->rdev->flags & RADEON_IS_AGP) { |
99 | rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT; | 99 | rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_SYSTEM; |
100 | } else { | 100 | } else { |
101 | rbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_TT; | 101 | rbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM; |
102 | } | 102 | } |
103 | } | 103 | } |
104 | if (!c) | 104 | if (!c) |