Commit b9d022c6 authored by Nicolai Hähnle's avatar Nicolai Hähnle Committed by Alex Deucher

Revert "drm/amdgpu: fix a potential deadlock in amdgpu_bo_create_restricted()"

This reverts commit 38fc4856, which
introduces a use-after-free.

The underlying bug should be properly fixed with "drm/ttm: never add BO
that failed to validate to the LRU list".

Cc: zhoucm1 <david1.zhou@amd.com>
Signed-off-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: default avatarSamuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c2c139cf
...@@ -411,11 +411,8 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, ...@@ -411,11 +411,8 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
amdgpu_cs_report_moved_bytes(adev, amdgpu_cs_report_moved_bytes(adev,
atomic64_read(&adev->num_bytes_moved) - initial_bytes_moved); atomic64_read(&adev->num_bytes_moved) - initial_bytes_moved);
if (unlikely(r != 0)) { if (unlikely(r != 0))
if (!resv)
ww_mutex_unlock(&bo->tbo.resv->lock);
return r; return r;
}
bo->tbo.priority = ilog2(bo->tbo.num_pages); bo->tbo.priority = ilog2(bo->tbo.num_pages);
if (kernel) if (kernel)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment