drm/ttm: fix ttm_bo_bulk_move_helper
Staring at the function for six hours, just to essentially move one line of code. The problem was that the first list_cut_position call could result in list2 pointing to la-la-land. Signed-off-by: Christian König <christian.koenig@amd.com> Tested-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Родитель
88b35d83a7
Коммит
972a21f946
|
@ -250,15 +250,18 @@ EXPORT_SYMBOL(ttm_bo_move_to_lru_tail);
|
||||||
static void ttm_bo_bulk_move_helper(struct ttm_lru_bulk_move_pos *pos,
|
static void ttm_bo_bulk_move_helper(struct ttm_lru_bulk_move_pos *pos,
|
||||||
struct list_head *lru, bool is_swap)
|
struct list_head *lru, bool is_swap)
|
||||||
{
|
{
|
||||||
|
struct list_head *list;
|
||||||
LIST_HEAD(entries);
|
LIST_HEAD(entries);
|
||||||
LIST_HEAD(before);
|
LIST_HEAD(before);
|
||||||
struct list_head *list1, *list2;
|
|
||||||
|
|
||||||
list1 = is_swap ? &pos->last->swap : &pos->last->lru;
|
reservation_object_assert_held(pos->last->resv);
|
||||||
list2 = is_swap ? pos->first->swap.prev : pos->first->lru.prev;
|
list = is_swap ? &pos->last->swap : &pos->last->lru;
|
||||||
|
list_cut_position(&entries, lru, list);
|
||||||
|
|
||||||
|
reservation_object_assert_held(pos->first->resv);
|
||||||
|
list = is_swap ? pos->first->swap.prev : pos->first->lru.prev;
|
||||||
|
list_cut_position(&before, &entries, list);
|
||||||
|
|
||||||
list_cut_position(&entries, lru, list1);
|
|
||||||
list_cut_position(&before, &entries, list2);
|
|
||||||
list_splice(&before, lru);
|
list_splice(&before, lru);
|
||||||
list_splice_tail(&entries, lru);
|
list_splice_tail(&entries, lru);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче