mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-21 06:46:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: backend/drm: move pending CRTC to connector state

Browse source
This commit is contained in:
Simon Ser 2022-12-06 18:15:04 +01:00
parent bf5114df6f
commit 8fb34d1d00
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/drm/atomic.c
View file

@ -203,10 +203,10 @@ static bool atomic_crtc_commit(struct wlr_drm_connector *conn,
bool test_only) {
struct wlr_drm_backend *drm = conn->backend;
struct wlr_output *output = &conn->output;
struct wlr_drm_crtc *crtc = conn->crtc;
bool modeset = state->modeset;
bool active = state->active;
struct wlr_drm_crtc *crtc = state->crtc;
uint32_t mode_id = crtc->mode_id;
if (modeset) {

37
backend/drm/drm.c
View file

@ -329,7 +329,7 @@ static bool drm_crtc_commit(struct wlr_drm_connector *conn,
assert((flags & ~DRM_MODE_PAGE_FLIP_FLAGS) == 0);
struct wlr_drm_backend *drm = conn->backend;
struct wlr_drm_crtc *crtc = conn->crtc;
struct wlr_drm_crtc *crtc = state->crtc;
bool ok = drm->iface->crtc_commit(conn, state, flags, test_only);
if (ok && !test_only) {
drm_fb_clear(&crtc->primary->queued_fb);
@ -359,6 +359,7 @@ static void drm_connector_state_init(struct wlr_drm_connector_state *state,
state->modeset = base->allow_artifacts;
state->active = (base->committed & WLR_OUTPUT_STATE_ENABLED) ?
base->enabled : conn->output.enabled;
state->crtc = conn->crtc;
if (base->committed & WLR_OUTPUT_STATE_MODE) {
switch (base->mode_type) {
@ -401,9 +402,7 @@ static bool drm_connector_state_update_primary_fb(struct wlr_drm_connector *conn
assert(state->base->committed & WLR_OUTPUT_STATE_BUFFER);
struct wlr_drm_crtc *crtc = conn->crtc;
assert(crtc != NULL);
struct wlr_drm_crtc *crtc = state->crtc;
struct wlr_drm_plane *plane = crtc->primary;
struct wlr_buffer *source_buf = state->base->buffer;
@ -444,7 +443,15 @@ static bool drm_connector_state_update_primary_fb(struct wlr_drm_connector *conn
return true;
}
static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn);
static void realloc_crtcs(struct wlr_drm_backend *drm,
struct wlr_drm_connector_state *want_conn_state);
static bool drm_connector_state_alloc_crtc(struct wlr_drm_connector_state *state) {
if (state->crtc == NULL) {
realloc_crtcs(state->conn->backend, state);
}
return state->crtc != NULL;
}
static bool drm_connector_test(struct wlr_output *output,
const struct wlr_output_state *state) {
@ -488,7 +495,7 @@ static bool drm_connector_test(struct wlr_output *output,
goto out;
}
if (!drm_connector_alloc_crtc(conn)) {
if (!drm_connector_state_alloc_crtc(&pending)) {
wlr_drm_conn_log(conn, WLR_DEBUG,
"No CRTC available for this connector");
goto out;
@ -508,7 +515,7 @@ static bool drm_connector_test(struct wlr_output *output,
goto out;
}
if (!conn->crtc) {
if (!pending.crtc) {
// If the output is disabled, we don't have a crtc even after
// reallocation
ok = true;
@ -578,7 +585,7 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
}
if (pending.active) {
if (!drm_connector_alloc_crtc(conn)) {
if (!drm_connector_state_alloc_crtc(&pending)) {
wlr_drm_conn_log(conn, WLR_ERROR,
"No CRTC available for this connector");
goto out;
@ -700,16 +707,6 @@ struct wlr_drm_fb *get_next_cursor_fb(struct wlr_drm_connector *conn) {
return conn->crtc->cursor->current_fb;
}
static void realloc_crtcs(struct wlr_drm_backend *drm,
struct wlr_drm_connector *want_conn);
static bool drm_connector_alloc_crtc(struct wlr_drm_connector *conn) {
if (conn->crtc == NULL) {
realloc_crtcs(conn->backend, conn);
}
return conn->crtc != NULL;
}
static struct wlr_drm_mode *drm_mode_create(const drmModeModeInfo *modeinfo) {
struct wlr_drm_mode *mode = calloc(1, sizeof(*mode));
if (!mode) {
@ -1027,9 +1024,11 @@ static void dealloc_crtc(struct wlr_drm_connector *conn) {
}
static void realloc_crtcs(struct wlr_drm_backend *drm,
struct wlr_drm_connector *want_conn) {
struct wlr_drm_connector_state *want_conn_state) {
assert(drm->num_crtcs > 0);
struct wlr_drm_connector *want_conn = want_conn_state != NULL ? want_conn_state->conn : NULL;
size_t num_connectors = wl_list_length(&drm->connectors);
if (num_connectors == 0) {
return;

2
backend/drm/legacy.c
View file

@ -69,7 +69,7 @@ static bool legacy_crtc_commit(struct wlr_drm_connector *conn,
struct wlr_drm_backend *drm = conn->backend;
struct wlr_output *output = &conn->output;
struct wlr_drm_crtc *crtc = conn->crtc;
struct wlr_drm_crtc *crtc = state->crtc;
struct wlr_drm_plane *cursor = crtc->cursor;
uint32_t fb_id = 0;

1
include/backend/drm/drm.h
View file

@ -98,6 +98,7 @@ struct wlr_drm_connector_state {
bool modeset;
bool active;
drmModeModeInfo mode;
struct wlr_drm_crtc *crtc;
struct wlr_drm_fb *primary_fb;
};