Skip to content
This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

backend/drm: use drmCloseBufferHandle #3234

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions backend/drm/renderer.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,7 @@ static uint32_t get_bo_handle_for_fd(struct wlr_drm_backend *drm,
if (!drm_bo_handle_table_ref(&drm->bo_handles, handle)) {
// If that failed, the handle wasn't ref'ed in the table previously,
// so safe to delete
struct drm_gem_close args = { .handle = handle };
drmIoctl(drm->fd, DRM_IOCTL_GEM_CLOSE, &args);
drmCloseBufferHandle(drm->fd, handle);
return 0;
}

Expand All @@ -234,9 +233,8 @@ static void close_bo_handle(struct wlr_drm_backend *drm, uint32_t handle) {
return;
}

struct drm_gem_close args = { .handle = handle };
if (drmIoctl(drm->fd, DRM_IOCTL_GEM_CLOSE, &args) != 0) {
wlr_log_errno(WLR_ERROR, "drmIoctl(GEM_CLOSE) failed");
if (drmCloseBufferHandle(drm->fd, handle) != 0) {
wlr_log_errno(WLR_ERROR, "drmCloseBufferHandle failed");
}
}

Expand Down
22 changes: 21 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,27 @@ wayland_client = dependency('wayland-client',
default_options: wayland_project_options,
)

drm = dependency('libdrm', version: '>=2.4.105')
drm = dependency('libdrm',
version: '>=2.4.108',
fallback: ['libdrm', 'ext_libdrm'],
default_options: [
'libkms=false',
'intel=false',
'radeon=false',
'amdgpu=false',
'nouveau=false',
'vmwgfx=false',
'omap=false',
'exynos=false',
'freedreno=false',
'tegra=false',
'vc4=false',
'etnaviv=false',
'cairo-tests=false',
'man-pages=false',
'valgrind=false',
],
)
gbm = dependency('gbm', version: '>=17.1.0')
xkbcommon = dependency('xkbcommon')
udev = dependency('libudev')
Expand Down