<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<div style="margin: 0px; font-size: 12pt; font-family: Calibri, Arial, Helvetica, sans-serif">
Reviewed-by: Kevin Wang <kevin1.wang@amd.com></div>
<div style="margin: 0px; font-size: 12pt; font-family: Calibri, Arial, Helvetica, sans-serif">
<br>
</div>
<div style="margin: 0px; font-size: 12pt; font-family: Calibri, Arial, Helvetica, sans-serif">
Best Regards,<br>
Kevin</div>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> Christian König <ckoenig.leichtzumerken@gmail.com><br>
<b>Sent:</b> Thursday, October 10, 2019 7:26 PM<br>
<b>To:</b> dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; Wang, Kevin(Yang) <Kevin1.Wang@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com><br>
<b>Subject:</b> [PATCH] drm/ttm: fix handling in ttm_bo_add_mem_to_lru</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt">
<div class="PlainText">We should not add the BO to the swap LRU when the new mem is fixed and<br>
the TTM object about to be destroyed.<br>
<br>
Signed-off-by: Christian König <christian.koenig@amd.com><br>
---<br>
drivers/gpu/drm/ttm/ttm_bo.c | 5 +++--<br>
1 file changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c<br>
index 6394e0c5cc02..c51bb2c9ed4f 100644<br>
--- a/drivers/gpu/drm/ttm/ttm_bo.c<br>
+++ b/drivers/gpu/drm/ttm/ttm_bo.c<br>
@@ -185,8 +185,9 @@ static void ttm_bo_add_mem_to_lru(struct ttm_buffer_object *bo,<br>
list_add_tail(&bo->lru, &man->lru[bo->priority]);<br>
kref_get(&bo->list_kref);<br>
<br>
- if (bo->ttm && !(bo->ttm->page_flags &<br>
- (TTM_PAGE_FLAG_SG | TTM_PAGE_FLAG_SWAPPED))) {<br>
+ if (!(man->flags & TTM_MEMTYPE_FLAG_FIXED) && bo->ttm &&<br>
+ !(bo->ttm->page_flags & (TTM_PAGE_FLAG_SG |<br>
+ TTM_PAGE_FLAG_SWAPPED))) {<br>
list_add_tail(&bo->swap, &bdev->glob->swap_lru[bo->priority]);<br>
kref_get(&bo->list_kref);<br>
}<br>
-- <br>
2.14.1<br>
<br>
</div>
</span></font></div>
</body>
</html>