Takashi Iwai 1eea96
From 781050b0a3164934857c300bb0bc291e38c26b6f Mon Sep 17 00:00:00 2001
Takashi Iwai 1eea96
From: xinhui pan <xinhui.pan@amd.com>
Takashi Iwai 1eea96
Date: Wed, 10 Nov 2021 12:31:48 +0800
Takashi Iwai 1eea96
Subject: [PATCH] drm/ttm: Put BO in its memory manager's lru list
Takashi Iwai 1eea96
Mime-version: 1.0
Takashi Iwai 1eea96
Content-type: text/plain; charset=UTF-8
Takashi Iwai 1eea96
Content-transfer-encoding: 8bit
Takashi Iwai 1eea96
Git-commit: 781050b0a3164934857c300bb0bc291e38c26b6f
Takashi Iwai 1eea96
Patch-mainline: v5.17-rc1
Takashi Iwai 1eea96
References: git-fixes
Takashi Iwai 1eea96
Takashi Iwai 1eea96
After we move BO to a new memory region, we should put it to
Takashi Iwai 1eea96
the new memory manager's lru list regardless we unlock the resv or not.
Takashi Iwai 1eea96
Takashi Iwai 1eea96
Cc: stable@vger.kernel.org
Takashi Iwai 1eea96
Reviewed-by: Christian König <christian.koenig@amd.com>
Takashi Iwai 1eea96
Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Takashi Iwai 1eea96
Link: https://patchwork.freedesktop.org/patch/msgid/20211110043149.57554-1-xinhui.pan@amd.com
Takashi Iwai 1eea96
Signed-off-by: Christian König <christian.koenig@amd.com>
Takashi Iwai 1eea96
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 1eea96
Takashi Iwai 1eea96
---
Takashi Iwai 1eea96
 drivers/gpu/drm/ttm/ttm_bo.c | 2 ++
Takashi Iwai 1eea96
 1 file changed, 2 insertions(+)
Takashi Iwai 1eea96
Takashi Iwai 1eea96
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
Takashi Iwai 1eea96
index 3934ee225c78..f349ec8b91a1 100644
Takashi Iwai 1eea96
--- a/drivers/gpu/drm/ttm/ttm_bo.c
Takashi Iwai 1eea96
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
Takashi Iwai 1eea96
@@ -726,6 +726,8 @@ int ttm_mem_evict_first(struct ttm_device *bdev,
Takashi Iwai 1eea96
 	ret = ttm_bo_evict(bo, ctx);
Takashi Iwai 1eea96
 	if (locked)
Takashi Iwai 1eea96
 		ttm_bo_unreserve(bo);
Takashi Iwai 1eea96
+	else
Takashi Iwai 1eea96
+		ttm_bo_move_to_lru_tail_unlocked(bo);
Takashi Iwai 1eea96
 
Takashi Iwai 1eea96
 	ttm_bo_put(bo);
Takashi Iwai 1eea96
 	return ret;
Takashi Iwai 1eea96
-- 
Takashi Iwai 1eea96
2.31.1
Takashi Iwai 1eea96