diff options
| author | Christian König | 2017-12-15 13:36:49 +0100 |
|---|---|---|
| committer | Alex Deucher | 2017-12-18 17:52:47 +0100 |
| commit | 827ed2b06b05a9e9791e10f03096cc5ddd85bc44 (patch) | |
| tree | b4ca0b86b5dff59bc36c01c4e6f13721eb11c2c0 /drivers/gpu/drm/ttm/ttm_bo.c | |
| parent | drm/amdgpu: restore uvd fence seq in uvd resume (diff) | |
| download | kernel-qcow2-linux-827ed2b06b05a9e9791e10f03096cc5ddd85bc44.tar.gz kernel-qcow2-linux-827ed2b06b05a9e9791e10f03096cc5ddd85bc44.tar.xz kernel-qcow2-linux-827ed2b06b05a9e9791e10f03096cc5ddd85bc44.zip | |
drm/ttm: use try_lock in ttm_bo_delayed_delete again
We only need to wait for the contended lock when the reservation object is
shared or when we want to remove everything. A trylock should be sufficient
in all other cases.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Roger He <Hongbo.He@amd.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index ba5b48617bba..122a964cac40 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -586,12 +586,17 @@ static bool ttm_bo_delayed_delete(struct ttm_bo_device *bdev, bool remove_all) ddestroy); kref_get(&bo->list_kref); list_move_tail(&bo->ddestroy, &removed); - spin_unlock(&glob->lru_lock); - reservation_object_lock(bo->resv, NULL); + if (remove_all || bo->resv != &bo->ttm_resv) { + spin_unlock(&glob->lru_lock); + reservation_object_lock(bo->resv, NULL); - spin_lock(&glob->lru_lock); - ttm_bo_cleanup_refs(bo, false, !remove_all, true); + spin_lock(&glob->lru_lock); + ttm_bo_cleanup_refs(bo, false, !remove_all, true); + + } else if (reservation_object_trylock(bo->resv)) { + ttm_bo_cleanup_refs(bo, false, !remove_all, true); + } kref_put(&bo->list_kref, ttm_bo_release_list); spin_lock(&glob->lru_lock); |