[PATCH] drm/ttm: fix false positive assert

[Christian König]

Pierre-eric, just a gentle ping on this? Could I get a tested-by?

Ray can you ack or even review this?

Thanks,
Christian.

Am 06.03.20 um 13:41 schrieb Christian König:
> The assert sometimes incorrectly triggers when pinned BOs are destroyed.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>   drivers/gpu/drm/ttm/ttm_bo.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 2445e2bd6267..ca5a8d01ff1f 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -151,8 +151,6 @@ static void ttm_bo_add_mem_to_lru(struct ttm_buffer_object *bo,
>   	struct ttm_bo_device *bdev = bo->bdev;
>   	struct ttm_mem_type_manager *man;
>   
> -	dma_resv_assert_held(bo->base.resv);
> -
>   	if (!list_empty(&bo->lru))
>   		return;
>   
> @@ -611,7 +609,8 @@ static void ttm_bo_release(struct kref *kref)
>   		 */
>   		if (bo->mem.placement & TTM_PL_FLAG_NO_EVICT) {
>   			bo->mem.placement &= ~TTM_PL_FLAG_NO_EVICT;
> -			ttm_bo_move_to_lru_tail(bo, NULL);
> +			ttm_bo_del_from_lru(bo);
> +			ttm_bo_add_mem_to_lru(bo, &bo->mem);
>   		}
>   
>   		kref_init(&bo->kref);