]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
radeon: fix regression with eviction since evict caching changes
authorDave Airlie <airlied@redhat.com>
Fri, 14 Dec 2012 11:04:46 +0000 (21:04 +1000)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Dec 2012 15:45:28 +0000 (10:45 -0500)
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>
drivers/gpu/drm/radeon/radeon_object.c

index 93d3445477be11c45e730071c284feca9700fafa..883c95d8d90f4559b04b8a6e4ca319a896629681 100644 (file)
@@ -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)