Commit efa557bc authored by Christian König's avatar Christian König

drm/ttm: lock resv object during destruction

Calling ttm_bo_cleanup_memtype_use() destroys the TT object
which in turn could result in warnings without this.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Link: https://patchwork.freedesktop.org/patch/359288
parent 09606b54
...@@ -588,7 +588,8 @@ static void ttm_bo_release(struct kref *kref) ...@@ -588,7 +588,8 @@ static void ttm_bo_release(struct kref *kref)
ttm_mem_io_unlock(man); ttm_mem_io_unlock(man);
} }
if (!dma_resv_test_signaled_rcu(bo->base.resv, true)) { if (!dma_resv_test_signaled_rcu(bo->base.resv, true) ||
!dma_resv_trylock(bo->base.resv)) {
/* The BO is not idle, resurrect it for delayed destroy */ /* The BO is not idle, resurrect it for delayed destroy */
ttm_bo_flush_all_fences(bo); ttm_bo_flush_all_fences(bo);
bo->deleted = true; bo->deleted = true;
...@@ -621,6 +622,7 @@ static void ttm_bo_release(struct kref *kref) ...@@ -621,6 +622,7 @@ static void ttm_bo_release(struct kref *kref)
spin_unlock(&ttm_bo_glob.lru_lock); spin_unlock(&ttm_bo_glob.lru_lock);
ttm_bo_cleanup_memtype_use(bo); ttm_bo_cleanup_memtype_use(bo);
dma_resv_unlock(bo->base.resv);
BUG_ON(bo->mem.mm_node != NULL); BUG_ON(bo->mem.mm_node != NULL);
atomic_dec(&ttm_bo_glob.bo_count); atomic_dec(&ttm_bo_glob.bo_count);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment