| From 239ac65fa5ffab71adf66e642750f940e7241d99 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> |
| Date: Wed, 25 Jan 2017 17:21:31 +0900 |
| Subject: drm/ttm: Make sure BOs being swapped out are cacheable |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Michel Dänzer <michel.daenzer@amd.com> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/ttm/ttm_bo.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/ttm/ttm_bo.c |
| +++ b/drivers/gpu/drm/ttm/ttm_bo.c |
| @@ -1621,7 +1621,6 @@ static int ttm_bo_swapout(struct ttm_mem |
| 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) { |
| @@ -1657,7 +1656,8 @@ static int ttm_bo_swapout(struct ttm_mem |
| 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; |