[PATCH] drm/ttm: fix handling in ttm_bo_add_mem_to_lru

[Wang, Kevin(Yang)]

Reviewed-by: Kevin Wang <kevin1.wang at amd.com>

Best Regards,
Kevin
________________________________
From: Christian König <ckoenig.leichtzumerken at gmail.com>
Sent: Thursday, October 10, 2019 7:26 PM
To: dri-devel at lists.freedesktop.org <dri-devel at lists.freedesktop.org>; Wang, Kevin(Yang) <Kevin1.Wang at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>
Subject: [PATCH] drm/ttm: fix handling in ttm_bo_add_mem_to_lru

We should not add the BO to the swap LRU when the new mem is fixed and
the TTM object about to be destroyed.

Signed-off-by: Christian König <christian.koenig at amd.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 6394e0c5cc02..c51bb2c9ed4f 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -185,8 +185,9 @@ static void ttm_bo_add_mem_to_lru(struct ttm_buffer_object *bo,
         list_add_tail(&bo->lru, &man->lru[bo->priority]);
         kref_get(&bo->list_kref);

-       if (bo->ttm && !(bo->ttm->page_flags &
-                        (TTM_PAGE_FLAG_SG | TTM_PAGE_FLAG_SWAPPED))) {
+       if (!(man->flags & TTM_MEMTYPE_FLAG_FIXED) && bo->ttm &&
+           !(bo->ttm->page_flags & (TTM_PAGE_FLAG_SG |
+                                    TTM_PAGE_FLAG_SWAPPED))) {
                 list_add_tail(&bo->swap, &bdev->glob->swap_lru[bo->priority]);
                 kref_get(&bo->list_kref);
         }
--
2.14.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20191010/78502f16/attachment.html>