Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 239ac65f authored by Michel Dänzer's avatar Michel Dänzer Committed by Christian König
Browse files

drm/ttm: Make sure BOs being swapped out are cacheable 



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.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com&gt;.>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent ba0c6d00

drivers/gpu/drm/ttm/ttm_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -1670,7 +1670,6 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) 
	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);

	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

	 */



	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;