KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This reverts commit 552028c013.

Required by the next reverted commit.
This commit is contained in:
Marek Olšák 2020-01-27 17:40:32 -05:00
parent 993f866d2e
commit ba06c7620f
2 changed files with 3 additions and 21 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,21 +183,10 @@ 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) {
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);
}
if (sws_iter->kms_handles)
_mesa_hash_table_remove_key(sws_iter->kms_handles, bo);
}
simple_mtx_unlock(&ws->sws_list_lock);

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

@ -304,15 +304,8 @@ static bool amdgpu_winsys_unref(struct radeon_winsys *rws)
simple_mtx_unlock(&aws->sws_list_lock);
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);
}
if (ret && sws->kms_handles)
_mesa_hash_table_destroy(sws->kms_handles, NULL);
}
return ret;
}