diff options
| author | Daniel Stone <daniels@collabora.com> | 2016-12-08 16:36:18 +0000 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2018-07-06 15:04:52 +0100 |
| commit | 65a4dbcc14810c4c96437966dbcb2d9641b332a2 (patch) | |
| tree | bbbfdef353a6928a16e8f579a884ddb7eaaf41b4 | |
| parent | 8eece0c2e7dd2bc44efd8a476062b20dbbe451e2 (diff) | |
| download | weston-65a4dbcc14810c4c96437966dbcb2d9641b332a2.tar.gz | |
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>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Emre Ucan <eucan@de.adit-jv.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libweston/compositor-drm.c | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 39168e20..adb998dd 100644 --- a/configure.ac +++ b/configure.ac @@ -206,6 +206,9 @@ AM_CONDITIONAL(ENABLE_DRM_COMPOSITOR, test x$enable_drm_compositor = xyes) if test x$enable_drm_compositor = xyes; then AC_DEFINE([BUILD_DRM_COMPOSITOR], [1], [Build the DRM compositor]) PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm >= 2.4.30 gbm]) + 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])]) PKG_CHECK_MODULES(DRM_COMPOSITOR_ATOMIC, [libdrm >= 2.4.78], [AC_DEFINE([HAVE_DRM_ATOMIC], 1, [libdrm supports atomic API])], [AC_MSG_WARN([libdrm does not support atomic modesetting, will omit that capability])]) diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index 780c341a..80f88ed9 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -314,6 +314,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; @@ -883,7 +884,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 != DRM_FORMAT_MOD_INVALID) { + /* KMS demands that if a modifier is set, it must be the same + * for all planes. */ +#ifdef HAVE_DRM_ADDFB2_MODIFIERS + for (i = 0; i < (int) ARRAY_LENGTH(mods) && 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, @@ -945,6 +967,7 @@ drm_fb_create_dumb(struct drm_backend *b, int width, int height, goto err_fb; fb->type = BUFFER_PIXMAN_DUMB; + fb->modifier = DRM_FORMAT_MOD_INVALID; fb->handles[0] = create_arg.handle; fb->strides[0] = create_arg.pitch; fb->size = create_arg.size; @@ -1012,6 +1035,7 @@ drm_fb_get_from_bo(struct gbm_bo *bo, struct drm_backend *backend, fb->strides[0] = gbm_bo_get_stride(bo); fb->handles[0] = gbm_bo_get_handle(bo).u32; fb->format = pixel_format_get_info(gbm_bo_get_format(bo)); + fb->modifier = DRM_FORMAT_MOD_INVALID; fb->size = fb->strides[0] * fb->height; fb->fd = backend->drm.fd; |