diff options
| author | Daniel Stone <daniels@collabora.com> | 2016-12-08 16:36:18 +0000 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2017-02-07 19:16:33 +0000 |
| commit | 5e0fda76ebfeba322c05c48666ff4a01d38966a3 (patch) | |
| tree | 36b90b00c6ef1f88f369d4614f174f94515ce7f4 | |
| parent | 81ee356ab7741d84837c852466f8cbdb5dd763bc (diff) | |
compositor-drm: Support modifiers for drm_fb
Use the new drmModeAddFB2WithModifiers interface to import buffers with
modifiers.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Differential Revision: https://phabricator.freedesktop.org/D1526
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libweston/compositor-drm.c | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 328b6386..15be7d46 100644 --- a/configure.ac +++ b/configure.ac @@ -209,6 +209,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 d997264b..77d6751e 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -248,6 +248,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; @@ -881,7 +882,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, @@ -1034,6 +1056,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; |