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 /backend/drm/atomic.c | |
| 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 'backend/drm/atomic.c')
| -rw-r--r-- | backend/drm/atomic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index a1774f9c..ba493f6f 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -1,4 +1,3 @@ -#include <gbm.h> #include <stdlib.h> #include <wlr/util/log.h> #include <xf86drm.h> @@ -144,8 +143,8 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_backend *drm, goto error; } - uint32_t width = gbm_bo_get_width(fb->bo); - uint32_t height = gbm_bo_get_height(fb->bo); + uint32_t width = fb->wlr_buf->width; + uint32_t height = fb->wlr_buf->height; // The src_* properties are in 16.16 fixed point atomic_add(atom, id, props->src_x, 0); |