mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-11 13:29:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/drm: add support for libliftoff v0.5.0

Browse source 
Don't require libliftoff 0.5.0 just yet: we want to be able to
backport this patch.

(cherry-picked from commit 6e6c4408d3)
This commit is contained in:
Simon Ser 2024-05-28 00:30:33 +02:00 • committed by Consolatis
parent bc73e507ab
commit 1bfd0613ca
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/drm/libliftoff.c
View file

@ -7,6 +7,7 @@
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "backend/drm/iface.h" #include "backend/drm/iface.h"
#include "config.h"
static bool init(struct wlr_drm_backend *drm) { static bool init(struct wlr_drm_backend *drm) {
// TODO: lower log level // TODO: lower log level
@ -436,7 +437,11 @@ static bool crtc_commit(struct wlr_drm_connector *conn,
goto out; goto out;
} }
#if HAVE_LIBLIFTOFF_0_5
int ret = liftoff_output_apply(crtc->liftoff, req, flags, NULL);
#else
int ret = liftoff_output_apply(crtc->liftoff, req, flags); int ret = liftoff_output_apply(crtc->liftoff, req, flags);
#endif
if (ret != 0) { if (ret != 0) {
wlr_drm_conn_log(conn, test_only ? WLR_DEBUG : WLR_ERROR, wlr_drm_conn_log(conn, test_only ? WLR_DEBUG : WLR_ERROR,
"liftoff_output_apply failed: %s", strerror(-ret)); "liftoff_output_apply failed: %s", strerror(-ret));

1
backend/drm/meson.build
View file

@ -47,6 +47,7 @@ wlr_files += files(
if libliftoff.found() if libliftoff.found()
wlr_files += files('libliftoff.c') wlr_files += files('libliftoff.c')
internal_config.set10('HAVE_LIBLIFTOFF_0_5', libliftoff.version().version_compare('>=0.5.0'))
endif endif
features += { 'drm-backend': true } features += { 'drm-backend': true }