nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 07:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Simon Ser 2024-05-28 00:30:33 +02:00 committed by Kirill Primak
parent 862a0b4826
commit 6e6c4408d3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/drm/libliftoff.c
View File

@ -8,6 +8,7 @@
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "backend/drm/fb.h" #include "backend/drm/fb.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
@ -407,7 +408,11 @@ static bool commit(struct wlr_drm_backend *drm,
struct wlr_drm_connector *conn = state->connectors[i].connector; struct wlr_drm_connector *conn = state->connectors[i].connector;
struct wlr_drm_crtc *crtc = conn->crtc; struct wlr_drm_crtc *crtc = conn->crtc;
#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

@ -48,6 +48,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 }