diff options
| author | Simon Ser <contact@emersion.fr> | 2021-08-23 17:41:08 +0200 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-08-25 10:05:37 -0400 |
| commit | 5dfaf5ea9ccaeddc236ca103147415b520f73d98 (patch) | |
| tree | 19ca7a4000277e9c9849282bbfe5f4b000f3fed0 /include/backend/drm/drm.h | |
| parent | 749b3c00f0d0cb3575c8f058ea8c5e9877d4fd9c (diff) | |
backend/drm: introduce wlr_drm_bo_handle_table
Using GBM to import DRM dumb buffers tends to not work well. By
using GBM we're calling some driver-specific functions in Mesa.
These functions check whether Mesa can work with the buffer.
Sometimes Mesa has requirements which differ from DRM dumb buffers
and the GBM import will fail (e.g. on amdgpu).
Instead, drop GBM and use drmPrimeFDToHandle directly. But there's
a twist: BO handles are not ref'counted by the kernel and need to
be ref'counted in user-space [1]. libdrm usually performs this
bookkeeping and is used under-the-hood by Mesa.
We can't re-use libdrm for this task without using driver-specific
APIs. So let's just re-implement the ref'counting logic in wlroots.
The wlroots implementation is inspired from amdgpu's in libdrm [2].
Closes: https://github.com/swaywm/wlroots/issues/2916
[1]: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/110
[2]: https://gitlab.freedesktop.org/mesa/drm/-/blob/1a4c0ec9aea13211997f982715fe5ffcf19dd067/amdgpu/handle_table.c
Diffstat (limited to 'include/backend/drm/drm.h')
| -rw-r--r-- | include/backend/drm/drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 9aae5e0b..d57ddbf4 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -1,7 +1,6 @@ #ifndef BACKEND_DRM_DRM_H #define BACKEND_DRM_DRM_H -#include <gbm.h> #include <stdbool.h> #include <stddef.h> #include <stdint.h> @@ -12,6 +11,7 @@ #include <wlr/backend/session.h> #include <wlr/render/drm_format_set.h> #include <xf86drmMode.h> +#include "backend/drm/bo_handle_table.h" #include "backend/drm/iface.h" #include "backend/drm/properties.h" #include "backend/drm/renderer.h" @@ -62,7 +62,7 @@ struct wlr_drm_backend { int fd; char *name; struct wlr_device *dev; - struct gbm_device *gbm; + struct wlr_drm_bo_handle_table bo_handles; size_t num_crtcs; struct wlr_drm_crtc *crtcs; |