diff options
author | Michel Dänzer <mdaenzer@redhat.com> | 2020-01-31 18:24:31 +0100 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-02-04 19:53:09 +0000 |
commit | ee2a8992f08ba99c616bb3a90377864e95692144 (patch) | |
tree | a8b7dfcad1c7766702a897f12f4125bcb68dc8c2 /src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | |
parent | b8a7b7efd98878408dcabfcde8cd91de172cc664 (diff) | |
download | mesa-ee2a8992f08ba99c616bb3a90377864e95692144.tar.gz |
winsys/amdgpu: Close KMS handles for other DRM file descriptions
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: 11a3679e3aba "winsys/amdgpu: Make KMS handles valid for original
DRM file descriptor"
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
(Cherry picked from commit ca6a22305b275b49fbc88b8f4cba2fefb24c2a5d)
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3693>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3693>
Diffstat (limited to 'src/gallium/winsys/amdgpu/drm/amdgpu_bo.c')
-rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 66ccfc89ab5..bd8f055ea2c 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -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); |