From ebb661532c57bf5c44301b03602abd2cd30f794f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sun, 13 Jun 2021 14:19:42 +0200 Subject: backend/drm: remove SCANOUT check in drm_connector_test We only accept SCANOUT, the buffer type should never be set to RENDER. --- backend/drm/drm.c | 3 +-- backend/drm/legacy.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 54b225a0..1218fa9d 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -466,8 +466,7 @@ static bool drm_connector_test(struct wlr_output *output) { } } - if ((output->pending.committed & WLR_OUTPUT_STATE_BUFFER) && - output->pending.buffer_type == WLR_OUTPUT_STATE_BUFFER_SCANOUT) { + if ((output->pending.committed & WLR_OUTPUT_STATE_BUFFER) && !conn->backend->parent) { if (!drm_connector_set_pending_fb(conn, &output->pending)) { return false; } diff --git a/backend/drm/legacy.c b/backend/drm/legacy.c index 4750c1ce..daeeb8dd 100644 --- a/backend/drm/legacy.c +++ b/backend/drm/legacy.c @@ -36,7 +36,6 @@ static bool legacy_crtc_test(struct wlr_drm_connector *conn, struct wlr_drm_crtc *crtc = conn->crtc; if ((state->committed & WLR_OUTPUT_STATE_BUFFER) && - state->buffer_type == WLR_OUTPUT_STATE_BUFFER_SCANOUT && !drm_connector_state_is_modeset(state)) { struct wlr_drm_fb *pending_fb = crtc->primary->pending_fb; -- cgit v1.2.3