Hi This fixes a boot issue I had on Raven ( https://bugs.freedesktop.org/show_bug.cgi?id=107922) Feel free to add to both patches: Tested-by: Mike Lothian <mike at fireburn.co.uk> Cheers Mike On Thu, 13 Sep 2018 at 12:22 Christian König < ckoenig.leichtzumerken at gmail.com> wrote: > While cutting the lists we sometimes accidentally added a list_head from > the stack to the LRUs, effectively corrupting the list. > > Remove the list cutting and use explicit list manipulation instead. > > v2: separate out new list_bulk_move_tail helper > > Signed-off-by: Christian König <christian.koenig at amd.com> > --- > drivers/gpu/drm/ttm/ttm_bo.c | 46 > +++++++++++++++++++------------------------- > 1 file changed, 20 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 138c98902033..26b889f86670 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -247,47 +247,38 @@ void ttm_bo_move_to_lru_tail(struct > ttm_buffer_object *bo, > } > EXPORT_SYMBOL(ttm_bo_move_to_lru_tail); > > -static void ttm_bo_bulk_move_helper(struct ttm_lru_bulk_move_pos *pos, > - struct list_head *lru, bool is_swap) > -{ > - struct list_head *list; > - LIST_HEAD(entries); > - LIST_HEAD(before); > - > - reservation_object_assert_held(pos->last->resv); > - 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_splice(&before, lru); > - list_splice_tail(&entries, lru); > -} > - > void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk) > { > unsigned i; > > for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { > + struct ttm_lru_bulk_move_pos *pos = &bulk->tt[i]; > struct ttm_mem_type_manager *man; > > - if (!bulk->tt[i].first) > + if (!pos->first) > continue; > > - man = &bulk->tt[i].first->bdev->man[TTM_PL_TT]; > - ttm_bo_bulk_move_helper(&bulk->tt[i], &man->lru[i], false); > + reservation_object_assert_held(pos->first->resv); > + reservation_object_assert_held(pos->last->resv); > + > + man = &pos->first->bdev->man[TTM_PL_TT]; > + list_bulk_move_tail(&man->lru[i], &pos->first->lru, > + &pos->last->lru); > } > > for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { > + struct ttm_lru_bulk_move_pos *pos = &bulk->vram[i]; > struct ttm_mem_type_manager *man; > > - if (!bulk->vram[i].first) > + if (!pos->first) > continue; > > - man = &bulk->vram[i].first->bdev->man[TTM_PL_VRAM]; > - ttm_bo_bulk_move_helper(&bulk->vram[i], &man->lru[i], > false); > + reservation_object_assert_held(pos->first->resv); > + reservation_object_assert_held(pos->last->resv); > + > + man = &pos->first->bdev->man[TTM_PL_VRAM]; > + list_bulk_move_tail(&man->lru[i], &pos->first->lru, > + &pos->last->lru); > } > > for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { > @@ -297,8 +288,11 @@ void ttm_bo_bulk_move_lru_tail(struct > ttm_lru_bulk_move *bulk) > if (!pos->first) > continue; > > + reservation_object_assert_held(pos->first->resv); > + reservation_object_assert_held(pos->last->resv); > + > lru = &pos->first->bdev->glob->swap_lru[i]; > - ttm_bo_bulk_move_helper(&bulk->swap[i], lru, true); > + list_bulk_move_tail(lru, &pos->first->swap, > &pos->last->swap); > } > } > EXPORT_SYMBOL(ttm_bo_bulk_move_lru_tail); > -- > 2.14.1 > > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel > -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180913/9703537f/attachment.html>
