From: Christian König <[email protected]> When two VMs stop using PRT support at the same time we might not disable it in the right order otherwise.
Signed-off-by: Christian König <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index bc32239..447cda5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1200,7 +1200,8 @@ static void amdgpu_vm_prt_cb(struct fence *fence, struct fence_cb *_cb) { struct amdgpu_prt_cb *cb = container_of(_cb, struct amdgpu_prt_cb, cb); - amdgpu_vm_update_prt_state(cb->adev); + if (atomic_dec_return(&cb->adev->vm_manager.num_prt_mappings) == 0) + amdgpu_vm_update_prt_state(cb->adev); kfree(cb); } @@ -1219,17 +1220,14 @@ static void amdgpu_vm_free_mapping(struct amdgpu_device *adev, struct amdgpu_bo_va_mapping *mapping, struct fence *fence) { - if ((mapping->flags & AMDGPU_PTE_PRT) && - atomic_dec_return(&adev->vm_manager.num_prt_mappings) == 0) { + if (mapping->flags & AMDGPU_PTE_PRT) { struct amdgpu_prt_cb *cb = kmalloc(sizeof(struct amdgpu_prt_cb), GFP_KERNEL); cb->adev = adev; if (!fence || fence_add_callback(fence, &cb->cb, - amdgpu_vm_prt_cb)) { - amdgpu_vm_update_prt_state(adev); - kfree(cb); - } + amdgpu_vm_prt_cb)) + amdgpu_vm_prt_cb(fence, &cb->cb); } kfree(mapping); } -- 2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
