fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-23 18:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

winsys/amdgpu: don't hold a mutex while accessing is_shared

Browse source 
It adds overhead to amdgpu_bo_wait and I'm not sure whether the mutex
is even needed.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10813>
This commit is contained in:
Marek Olšák 2021-05-07 09:17:12 -04:00 • committed by Marge Bot
parent 4602147561
commit 66c8e40d69
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
View file

@ -67,14 +67,7 @@ static bool amdgpu_bo_wait(struct radeon_winsys *rws,
return false;
}
bool is_shared = false;
if (bo->bo) {
simple_mtx_lock(&bo->lock);
is_shared = bo->u.real.is_shared;
simple_mtx_unlock(&bo->lock);
}
if (is_shared) {
if (bo->bo && bo->u.real.is_shared) {
/* We can't use user fences for shared buffers, because user fences
* are local to this process only. If we want to wait for all buffer
* uses in all processes, we have to use amdgpu_bo_wait_for_idle.
@ -1651,11 +1644,7 @@ static bool amdgpu_bo_get_handle(struct radeon_winsys *rws,
if (sws->fd == ws->fd) {
whandle->handle = bo->u.real.kms_handle;
simple_mtx_lock(&bo->lock);
bool is_shared = bo->u.real.is_shared;
simple_mtx_unlock(&bo->lock);
if (is_shared)
if (bo->u.real.is_shared)
return true;
goto hash_table_set;
@ -1701,9 +1690,7 @@ static bool amdgpu_bo_get_handle(struct radeon_winsys *rws,
_mesa_hash_table_insert(ws->bo_export_table, bo->bo, bo);
simple_mtx_unlock(&ws->bo_export_table_lock);
simple_mtx_lock(&bo->lock);
bo->u.real.is_shared = true;
simple_mtx_unlock(&bo->lock);
return true;
}