fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

winsys/amdgpu: Close KMS handles for other DRM file descriptions

Browse source 
When a BO or amdgpu_screen_winsys is destroyed.

Should fix leaking such BOs in other DRM file descriptions.

v2:
* Pass the correct file descriptor to drmIoctl (Pierre-Eric
  Pelloux-Prayer)
* Use _mesa_hash_table_remove
v3:
* Close handles in amdgpu_winsys_unref as well
v4:
* Adapt to amdgpu_winsys::sws_list_lock.

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2270
Fixes: 11a3679e3a "winsys/amdgpu: Make KMS handles valid for original
                     DRM file descriptor"

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3202>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3202>
This commit is contained in:
Michel Dänzer 2019-12-23 18:59:10 +01:00 • committed by Michel Dänzer
parent b60f5cbc15
commit 552028c013
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,10 +183,21 @@ void amdgpu_bo_destroy(struct pb_buffer *_buf)
simple_mtx_unlock(&ws->global_bo_list_lock);
}
/* Close all KMS handles retrieved for other DRM file descriptions */
simple_mtx_lock(&ws->sws_list_lock);
for (sws_iter = ws->sws_list; sws_iter; sws_iter = sws_iter->next) {
if (sws_iter->kms_handles)
_mesa_hash_table_remove_key(sws_iter->kms_handles, bo);
struct hash_entry *entry;
if (!sws_iter->kms_handles)
continue;
entry = _mesa_hash_table_search(sws_iter->kms_handles, bo);
if (entry) {
struct drm_gem_close args = { .handle = (uintptr_t)entry->data };
drmIoctl(sws_iter->fd, DRM_IOCTL_GEM_CLOSE, &args);
_mesa_hash_table_remove(sws_iter->kms_handles, entry);
}
}
simple_mtx_unlock(&ws->sws_list_lock);

9
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
View file

@ -304,8 +304,15 @@ static bool amdgpu_winsys_unref(struct radeon_winsys *rws)
simple_mtx_unlock(&aws->sws_list_lock);
if (ret && sws->kms_handles)
if (ret && sws->kms_handles) {
struct drm_gem_close args;
hash_table_foreach(sws->kms_handles, entry) {
args.handle = (uintptr_t)entry->data;
drmIoctl(sws->fd, DRM_IOCTL_GEM_CLOSE, &args);
}
_mesa_hash_table_destroy(sws->kms_handles, NULL);
}
return ret;
}