drm/ttm: Make sure BOs being swapped out are cacheable
authorMichel Dänzer <michel.daenzer@amd.com>
Wed, 25 Jan 2017 08:21:31 +0000 (17:21 +0900)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 5 Jun 2017 20:13:44 +0000 (21:13 +0100)
commit 239ac65fa5ffab71adf66e642750f940e7241d99 upstream.

The current caching state may not be tt_cached, even though the
placement contains TTM_PL_FLAG_CACHED, because placement can contain
multiple caching flags. Trying to swap out such a BO would trip up the

BUG_ON(ttm->caching_state != tt_cached);

in ttm_tt_swapout.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Christian König <christian.koenig@amd.com>.
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/ttm/ttm_bo.c

index 22a89cd..f5e5037 100644 (file)
@@ -1807,7 +1807,6 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
        struct ttm_buffer_object *bo;
        int ret = -EBUSY;
        int put_count;
        struct ttm_buffer_object *bo;
        int ret = -EBUSY;
        int put_count;
-       uint32_t swap_placement = (TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM);
 
        spin_lock(&glob->lru_lock);
        while (ret == -EBUSY) {
 
        spin_lock(&glob->lru_lock);
        while (ret == -EBUSY) {
@@ -1860,7 +1859,8 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
        if (unlikely(ret != 0))
                goto out;
 
        if (unlikely(ret != 0))
                goto out;
 
-       if ((bo->mem.placement & swap_placement) != swap_placement) {
+       if (bo->mem.mem_type != TTM_PL_SYSTEM ||
+           bo->ttm->caching_state != tt_cached) {
                struct ttm_mem_reg evict_mem;
 
                evict_mem = bo->mem;
                struct ttm_mem_reg evict_mem;
 
                evict_mem = bo->mem;