blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: drop attempt_enable_needs_modeset 

Modesets require a buffer. The DRM backend tried to auto-enable
outputs when a CRTC becomes available in the past, but now that
fails because no buffer is available.

Instead of having this magic inside the DRM backend, a better
approach is to do it in the compositor or in an optional helper.
This commit is contained in:
Simon Ser 2021-09-07 11:28:40 +02:00 committed by Kenny Levinsen
parent 04304c322e
commit b01d97a38f
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
backend/drm/drm.c
View File

@ -654,27 +654,6 @@ struct wlr_drm_fb *plane_get_next_fb(struct wlr_drm_plane *plane) {
static void realloc_crtcs(struct wlr_drm_backend *drm); static void realloc_crtcs(struct wlr_drm_backend *drm);
static void attempt_enable_needs_modeset(struct wlr_drm_backend *drm) {
// Try to modeset any output that has a desired mode and a CRTC (ie. was
// lacking a CRTC on last modeset)
struct wlr_drm_connector *conn;
wl_list_for_each(conn, &drm->outputs, link) {
if (conn->status == WLR_DRM_CONN_NEEDS_MODESET &&
conn->crtc != NULL && conn->desired_mode != NULL &&
conn->desired_enabled) {
wlr_drm_conn_log(conn, WLR_DEBUG,
"Output has a desired mode and a CRTC, attempting a modeset");
struct wlr_output_state state = {
.committed = WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_ENABLED,
.enabled = true,
.mode_type = WLR_OUTPUT_STATE_MODE_FIXED,
.mode = conn->desired_mode,
};
drm_connector_commit_state(conn, &state);
}
}
}
static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn) { static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn) {
if (conn->crtc != NULL) { if (conn->crtc != NULL) {
return true; return true;
@ -690,8 +669,6 @@ static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn) {
static bool drm_connector_set_mode(struct wlr_drm_connector *conn, static bool drm_connector_set_mode(struct wlr_drm_connector *conn,
const struct wlr_drm_connector_state *state) { const struct wlr_drm_connector_state *state) {
struct wlr_drm_backend *drm = conn->backend;
struct wlr_output_mode *wlr_mode = NULL; struct wlr_output_mode *wlr_mode = NULL;
if (state->active) { if (state->active) {
if (state->base->committed & WLR_OUTPUT_STATE_MODE) { if (state->base->committed & WLR_OUTPUT_STATE_MODE) {
@ -719,8 +696,6 @@ static bool drm_connector_set_mode(struct wlr_drm_connector *conn,
if (!drm_crtc_commit(conn, state, 0, false)) { if (!drm_crtc_commit(conn, state, 0, false)) {
return false; return false;
} }
realloc_crtcs(drm);
attempt_enable_needs_modeset(drm);
} }
wlr_output_update_enabled(&conn->output, false); wlr_output_update_enabled(&conn->output, false);
return true; return true;
@ -1394,8 +1369,6 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
wlr_signal_emit_safe(&drm->backend.events.new_output, wlr_signal_emit_safe(&drm->backend.events.new_output,
&conn->output); &conn->output);
} }
attempt_enable_needs_modeset(drm);
} }
static int mhz_to_nsec(int mhz) { static int mhz_to_nsec(int mhz) {