Use the new drmModeAddFB2WithModifiers interface to import buffers with modifiers.
Signed-off-by: Daniel Stone <dani...@collabora.com> Differential Revision: https://phabricator.freedesktop.org/D1526 --- configure.ac | 3 +++ libweston/compositor-drm.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 54c6fcd..74fe7cd 100644 --- a/configure.ac +++ b/configure.ac @@ -207,6 +207,9 @@ if test x$enable_drm_compositor = xyes; then PKG_CHECK_MODULES(DRM_COMPOSITOR_ATOMIC, [libdrm >= 2.4.62], [AC_DEFINE([HAVE_DRM_ATOMIC], 1, [libdrm supports atomic API])], [AC_MSG_WARN([libdrm does not support atomic modesetting, will omit that capability])]) + PKG_CHECK_MODULES(DRM_COMPOSITOR_MODIFIERS, [libdrm >= 2.4.71], + [AC_DEFINE([HAVE_DRM_ADDFB2_MODIFIERS], 1, [libdrm supports modifiers])], + [AC_MSG_WARN([libdrm does not support AddFB2 with modifiers])]) fi diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index e6f94af..a36d27c 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -249,6 +249,7 @@ struct drm_fb { uint32_t strides[4]; uint32_t offsets[4]; const struct pixel_format_info *format; + uint64_t modifier; int width, height; int fd; struct weston_buffer_reference buffer_ref; @@ -882,7 +883,28 @@ drm_fb_destroy_gbm(struct gbm_bo *bo, void *data) static int drm_fb_addfb(struct drm_fb *fb) { - int ret; + int ret = -EINVAL; +#ifdef HAVE_DRM_ADDFB2_MODIFIERS + uint64_t mods[4] = { }; + int i; +#endif + + /* If we have a modifier set, we must only use the WithModifiers + * entrypoint; we cannot import it through legacy ioctls. */ + if (fb->modifier) { + /* KMS demands that if a modifier is set, it must be the same + * for all planes. */ +#ifdef HAVE_DRM_ADDFB2_MODIFIERS + for (i = 0; fb->handles[i]; i++) + mods[i] = fb->modifier; + ret = drmModeAddFB2WithModifiers(fb->fd, fb->width, fb->height, + fb->format->format, + fb->handles, fb->strides, + fb->offsets, mods, &fb->fb_id, + DRM_MODE_FB_MODIFIERS); +#endif + return ret; + } ret = drmModeAddFB2(fb->fd, fb->width, fb->height, fb->format->format, fb->handles, fb->strides, fb->offsets, &fb->fb_id, @@ -1023,6 +1045,7 @@ drm_fb_get_from_dmabuf(struct linux_dmabuf_buffer *dmabuf, memcpy(fb->strides, dmabuf->attributes.stride, sizeof(fb->strides)); memcpy(fb->offsets, dmabuf->attributes.offset, sizeof(fb->offsets)); fb->format = pixel_format_get_info(dmabuf->attributes.format); + fb->modifier = dmabuf->attributes.modifier[0]; fb->size = 0; fb->fd = backend->drm.fd; -- 2.9.3 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
