diff options
| author | Nirmoy Das <nirmoy.das@intel.com> | 2024-05-28 13:54:08 +0200 |
|---|---|---|
| committer | Nirmoy Das <nirmoy.das@intel.com> | 2024-05-29 10:56:47 +0200 |
| commit | a17aceb34e2f0ef36ffab0a96c51240e88a1c5fa (patch) | |
| tree | 110c22e7b8fef3f2d83370031846a56f4f59d0c0 /drivers/gpu/drm/xe/xe_bo.c | |
| parent | fa171d49e49af89dfece89ade803a5d471d919a8 (diff) | |
| download | lwn-a17aceb34e2f0ef36ffab0a96c51240e88a1c5fa.tar.gz lwn-a17aceb34e2f0ef36ffab0a96c51240e88a1c5fa.zip | |
drm/xe: Check empty pinned BO list with lock held.
Use lock that is meant to use for accessing the BO pin list.
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240528115408.22094-1-nirmoy.das@intel.com
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_bo.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_bo.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index 03f7fe7acf8c..2bae01ce4e5b 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -1758,11 +1758,10 @@ void xe_bo_unpin_external(struct xe_bo *bo) xe_assert(xe, xe_bo_is_pinned(bo)); xe_assert(xe, xe_bo_is_user(bo)); - if (bo->ttm.pin_count == 1 && !list_empty(&bo->pinned_link)) { - spin_lock(&xe->pinned.lock); + spin_lock(&xe->pinned.lock); + if (bo->ttm.pin_count == 1 && !list_empty(&bo->pinned_link)) list_del_init(&bo->pinned_link); - spin_unlock(&xe->pinned.lock); - } + spin_unlock(&xe->pinned.lock); ttm_bo_unpin(&bo->ttm); @@ -1785,9 +1784,8 @@ void xe_bo_unpin(struct xe_bo *bo) struct ttm_place *place = &(bo->placements[0]); if (mem_type_is_vram(place->mem_type)) { - xe_assert(xe, !list_empty(&bo->pinned_link)); - spin_lock(&xe->pinned.lock); + xe_assert(xe, !list_empty(&bo->pinned_link)); list_del_init(&bo->pinned_link); spin_unlock(&xe->pinned.lock); } |