From f9a371717c9331d21af092cf2d689a3f496813ec Mon Sep 17 00:00:00 2001
From: Alexander Orzechowski <alex@ozal.ski>
Date: Sun, 25 Feb 2024 04:12:52 -0500
Subject: backend/drm: Remove dead code
We can never hit the case where we try to light up an output without
a buffer. output_ensure_buffer() will catch this for now, and when that's
removed, output_basic_test() will catch this case.
---
backend/drm/drm.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index b6c43fc9..20e56318 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -672,20 +672,12 @@ static bool drm_connector_test(struct wlr_output *output,
}
}
- if ((state->committed & WLR_OUTPUT_STATE_ENABLED) ? state->enabled : output->enabled) {
- if ((state->committed &
- (WLR_OUTPUT_STATE_ENABLED | WLR_OUTPUT_STATE_MODE)) &&
- !(state->committed & WLR_OUTPUT_STATE_BUFFER)) {
- wlr_drm_conn_log(conn, WLR_DEBUG,
- "Can't enable an output without a buffer");
- return false;
- }
-
- if (!drm_connector_alloc_crtc(conn)) {
- wlr_drm_conn_log(conn, WLR_DEBUG,
- "No CRTC available for this connector");
- return false;
- }
+ if (((state->committed & WLR_OUTPUT_STATE_ENABLED)
+ ? state->enabled : output->enabled) &&
+ !drm_connector_alloc_crtc(conn)) {
+ wlr_drm_conn_log(conn, WLR_DEBUG,
+ "No CRTC available for this connector");
+ return false;
}
bool ok = false;
--
cgit v1.2.3