summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-07-26 14:59:10 +0200
committerAlex Deucher <alexander.deucher@amd.com>2017-08-17 15:45:55 -0400
commit1a33860d630c9cb4687ad01bda5651e96bad3694 (patch)
treea3becf02e23ba7c106c2838901b78ab966bb65e7
parent8824c751eb61ebffb053c291199932845bac88b4 (diff)
downloadlinux-stable-1a33860d630c9cb4687ad01bda5651e96bad3694.tar.gz
linux-stable-1a33860d630c9cb4687ad01bda5651e96bad3694.tar.bz2
linux-stable-1a33860d630c9cb4687ad01bda5651e96bad3694.zip
drm/ttm: remove nonsense wait in ttm_bo_cleanup_refs_and_unlock
With shared reservation objects the assumption that no fence could have been added isn't true any more. Additional to that the BO is about to be destroyed, so removing the fences now has no advantage whatsoever. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 22b57020790d..0f5c59f2e92c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -505,13 +505,6 @@ static int ttm_bo_cleanup_refs_and_unlock(struct ttm_buffer_object *bo,
spin_unlock(&glob->lru_lock);
return 0;
}
-
- /*
- * remove sync_obj with ttm_bo_wait, the wait should be
- * finished, and no new wait object should have been added.
- */
- ret = ttm_bo_wait(bo, false, true);
- WARN_ON(ret);
}
if (ret || unlikely(list_empty(&bo->ddestroy))) {