From: Vitaly Prosyak <[email protected]>
The WPTR caller no longer needs to reserve an eviction-fence slot.
The reservation is now performed in amdgpu_evf_mgr_rearm() immediately before
the replacement BOOKKEEP fence is attached. That is the operation that can add
the fence after the BO reservation was unlocked, so the caller-side reservation
is unnecessary and should be removed.
This reverts commit 118037152820 ("drm/amdgpu: reserve eviction-fence slot at
WPTR caller").
Cc: Christian König <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: Prike Liang <[email protected]>
Signed-off-by: Vitaly Prosyak <[email protected]>
Change-Id: I6158879300c8dba05e8e56da5573b8ab46c1d2c0
---
drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
index fe49aa4dc5ff..68beccee9fc0 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
@@ -60,8 +60,7 @@ mes_userq_create_wptr_mapping(struct amdgpu_device *adev,
}
obj = wptr_mapping->bo_va->base.bo;
- ret = drm_exec_prepare_obj(&exec, &obj->tbo.base,
- TTM_NUM_MOVE_FENCES + 1);
+ ret = drm_exec_lock_obj(&exec, &obj->tbo.base);
drm_exec_retry_on_contention(&exec);
if (unlikely(ret))
goto fail_lock;
--
2.55.0
