|
@@ -1670,7 +1670,6 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
|
|
struct ttm_buffer_object *bo;
|
|
struct ttm_buffer_object *bo;
|
|
int ret = -EBUSY;
|
|
int ret = -EBUSY;
|
|
int put_count;
|
|
int put_count;
|
|
- uint32_t swap_placement = (TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM);
|
|
|
|
|
|
|
|
spin_lock(&glob->lru_lock);
|
|
spin_lock(&glob->lru_lock);
|
|
list_for_each_entry(bo, &glob->swap_lru, swap) {
|
|
list_for_each_entry(bo, &glob->swap_lru, swap) {
|
|
@@ -1701,7 +1700,8 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
|
|
* Move to system cached
|
|
* Move to system cached
|
|
*/
|
|
*/
|
|
|
|
|
|
- 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;
|
|
struct ttm_mem_reg evict_mem;
|
|
|
|
|
|
evict_mem = bo->mem;
|
|
evict_mem = bo->mem;
|