From eca5d2f37f03a2044628f7084ca83d96b0f80395 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 6 Apr 2021 19:43:51 +0200 Subject: backend/drm: move session check from test_buffer to drm_connector_test The other caller (drm_connector_commit_state) already checks this. --- backend/drm/drm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 1f9a8384..48b55e41 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -391,10 +391,6 @@ static bool test_buffer(struct wlr_drm_connector *conn, struct wlr_buffer *wlr_buffer) { struct wlr_drm_backend *drm = conn->backend; - if (!drm->session->active) { - return false; - } - /* Legacy never gets to have nice things. But I doubt this would ever work, * and there is no reliable way to try, without risking messing up the * modesetting state. */ @@ -449,6 +445,10 @@ static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn); static bool drm_connector_test(struct wlr_output *output) { struct wlr_drm_connector *conn = get_drm_connector_from_output(output); + if (!conn->backend->session->active) { + return false; + } + if ((output->pending.committed & WLR_OUTPUT_STATE_ENABLED) && output->pending.enabled) { if (output->current_mode == NULL && -- cgit v1.2.3