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

backend/drm: allocate a CRTC in drm_connector_test 

We can't perform a test-only atomic commit if the connector is
missing a CRTC.
This commit is contained in:
Simon Ser 2021-04-06 19:31:40 +02:00 committed by Kenny Levinsen
parent cb378600e4
commit f55b43ddd6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/drm/drm.c
View File

@ -414,6 +414,8 @@ static bool test_buffer(struct wlr_drm_connector *conn,
return drm_crtc_commit(conn, &conn->output.pending, DRM_MODE_ATOMIC_TEST_ONLY); return drm_crtc_commit(conn, &conn->output.pending, DRM_MODE_ATOMIC_TEST_ONLY);
} }
static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn);
static bool drm_connector_test(struct wlr_output *output) { static bool drm_connector_test(struct wlr_output *output) {
struct wlr_drm_connector *conn = get_drm_connector_from_output(output); struct wlr_drm_connector *conn = get_drm_connector_from_output(output);
@ -427,6 +429,14 @@ static bool drm_connector_test(struct wlr_output *output) {
} }
} }
if (drm_connector_state_active(conn, &output->pending)) {
if (!drm_connector_alloc_crtc(conn)) {
wlr_drm_conn_log(conn, WLR_DEBUG,
"No CRTC available for this connector");
return false;
}
}
if ((output->pending.committed & WLR_OUTPUT_STATE_BUFFER) && if ((output->pending.committed & WLR_OUTPUT_STATE_BUFFER) &&
output->pending.buffer_type == WLR_OUTPUT_STATE_BUFFER_SCANOUT) { output->pending.buffer_type == WLR_OUTPUT_STATE_BUFFER_SCANOUT) {
if (!test_buffer(conn, output->pending.buffer)) { if (!test_buffer(conn, output->pending.buffer)) {