diff options
| author | Michel Dänzer <[email protected]> | 2019-12-23 18:59:10 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2020-01-23 17:39:34 +0100 |
| commit | 552028c013cc1d49a2b61ebe0fc3a3781a9ba826 (patch) | |
| tree | 2ae067440a65326a70b9b9f096934e33b00ca2ad /src/gallium | |
| parent | b60f5cbc15a99ddd9251bce40eae7d84c3a1c373 (diff) | |
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 <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3202>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3202>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 15 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 9 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index e6a5a7773e0..5fe1a837929 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); diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 8fadf584e3f..13a4b3ab7f1 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -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; } |