[PATCH] drm/amdgpu: move lockdep assert to the right place.

[Deucher, Alexander]

[Public]

Acked-by: Alex Deucher <alexander.deucher at amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Christian König <ckoenig.leichtzumerken at gmail.com>
Sent: Friday, February 4, 2022 3:52 AM
To: Bhardwaj, Rajneesh <Rajneesh.Bhardwaj at amd.com>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Subject: [PATCH] drm/amdgpu: move lockdep assert to the right place.

Since newly added BOs don't have any mappings it's ok to add them
without holding the VM lock. Only when we add per VM BOs the lock is
mandatory.

Signed-off-by: Christian König <christian.koenig at amd.com>
Reported-by: Bhardwaj, Rajneesh <Rajneesh.Bhardwaj at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index fdc6a1fd74af..dcc80d6e099e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -375,6 +375,8 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
         if (bo->tbo.base.resv != vm->root.bo->tbo.base.resv)
                 return;

+       dma_resv_assert_held(vm->root.bo->tbo.base.resv);
+
         vm->bulk_moveable = false;
         if (bo->tbo.type == ttm_bo_type_kernel && bo->parent)
                 amdgpu_vm_bo_relocated(base);
@@ -2260,8 +2262,6 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
 {
         struct amdgpu_bo_va *bo_va;

-       dma_resv_assert_held(vm->root.bo->tbo.base.resv);
-
         bo_va = kzalloc(sizeof(struct amdgpu_bo_va), GFP_KERNEL);
         if (bo_va == NULL) {
                 return NULL;
--
2.25.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20220204/28ccea5a/attachment.htm>