Skip to content

Commit 17d33bc

Browse files
ChristianKoenigAMDalexdeucher
authored andcommitted
drm/ttm: drop waiting for idle in ttm_bo_evict.
That is unnecessary now. Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent a6f76dc commit 17d33bc

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

drivers/gpu/drm/ttm/ttm_bo.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -684,15 +684,6 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible,
684684
struct ttm_placement placement;
685685
int ret = 0;
686686

687-
ret = ttm_bo_wait(bo, interruptible, no_wait_gpu);
688-
689-
if (unlikely(ret != 0)) {
690-
if (ret != -ERESTARTSYS) {
691-
pr_err("Failed to expire sync object before buffer eviction\n");
692-
}
693-
goto out;
694-
}
695-
696687
lockdep_assert_held(&bo->resv->lock.base);
697688

698689
evict_mem = bo->mem;
@@ -716,7 +707,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible,
716707

717708
ret = ttm_bo_handle_move_mem(bo, &evict_mem, true, interruptible,
718709
no_wait_gpu);
719-
if (ret) {
710+
if (unlikely(ret)) {
720711
if (ret != -ERESTARTSYS)
721712
pr_err("Buffer eviction failed\n");
722713
ttm_bo_mem_put(bo, &evict_mem);

0 commit comments

Comments
 (0)