aboutsummaryrefslogtreecommitdiff
path: root/backend/drm
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-03-31 22:05:18 +0200
committerSimon Zeni <simon@bl4ckb0ne.ca>2021-11-26 16:40:53 +0000
commite163a7cf486bf85e982e0fbe9c7a6588b0afb657 (patch)
tree23267888ad07cc2b7b2b439fcdeacc9ca91cfcc6 /backend/drm
parentaffe9eda5708a8368dd96870ddf2442c5b637202 (diff)
backend/drm: fail on explicit modifier in drmModeAddFB2
drmModeAddFB2 doesn't support explicit modifiers. Only accept INVALID which indicates an implicit modifier and LINEAR which may indicate that GBM_BO_USE_LINEAR has been used.
Diffstat (limited to 'backend/drm')
-rw-r--r--backend/drm/renderer.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 3d1a5fb2..bfc94a24 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -220,6 +220,13 @@ static uint32_t get_fb_for_bo(struct wlr_drm_backend *drm,
wlr_log_errno(WLR_DEBUG, "drmModeAddFB2WithModifiers failed");
}
} else {
+ if (dmabuf->modifier != DRM_FORMAT_MOD_INVALID &&
+ dmabuf->modifier != DRM_FORMAT_MOD_LINEAR) {
+ wlr_log(WLR_ERROR, "Cannot import DRM framebuffer with explicit "
+ "modifier 0x%"PRIX64, dmabuf->modifier);
+ return 0;
+ }
+
int ret = drmModeAddFB2(drm->fd, dmabuf->width, dmabuf->height,
dmabuf->format, handles, dmabuf->stride, dmabuf->offset, &id, 0);
if (ret != 0 && dmabuf->format == DRM_FORMAT_ARGB8888 &&