nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 16:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend/drm: use output_pending_enabled()

Browse Source 
Use the helper instead of hand-rolling the logic.
This commit is contained in:
Simon Ser 2024-02-26 17:19:51 +01:00
parent 374daeb256
commit ef4997b722
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/drm/drm.c
View File

@ -27,6 +27,7 @@
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "render/drm_format_set.h" #include "render/drm_format_set.h"
#include "render/wlr_renderer.h" #include "render/wlr_renderer.h"
#include "types/wlr_output.h"
#include "util/env.h" #include "util/env.h"
#include "config.h" #include "config.h"
@ -508,8 +509,7 @@ static void drm_connector_state_init(struct wlr_drm_connector_state *state,
*state = (struct wlr_drm_connector_state){ *state = (struct wlr_drm_connector_state){
.base = base, .base = base,
.modeset = base->allow_reconfiguration, .modeset = base->allow_reconfiguration,
.active = (base->committed & WLR_OUTPUT_STATE_ENABLED) ? .active = output_pending_enabled(&conn->output, base),
base->enabled : conn->output.enabled,
// The wlr_output API requires non-modeset commits with a new buffer to // The wlr_output API requires non-modeset commits with a new buffer to
// wait for the frame event. However compositors often perform // wait for the frame event. However compositors often perform
// non-modesets commits without a new buffer without waiting for the // non-modesets commits without a new buffer without waiting for the
@ -672,9 +672,7 @@ static bool drm_connector_test(struct wlr_output *output,
} }
} }
if (((state->committed & WLR_OUTPUT_STATE_ENABLED) if (output_pending_enabled(output, state) && !drm_connector_alloc_crtc(conn)) {
? state->enabled : output->enabled) &&
!drm_connector_alloc_crtc(conn)) {
wlr_drm_conn_log(conn, WLR_DEBUG, wlr_drm_conn_log(conn, WLR_DEBUG,
"No CRTC available for this connector"); "No CRTC available for this connector");
return false; return false;