From 741aaa3f761a7175f622150defac514da8f2fed6 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 14 Feb 2024 14:42:01 +0100 Subject: [PATCH] backend/drm: drop wlr_drm_backend arg from create_mode_blob() No need for this, the backend can be grabbed from the connector. --- backend/drm/atomic.c | 7 +++---- backend/drm/libliftoff.c | 2 +- include/backend/drm/iface.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c index 530ee254..60f20e03 100644 --- a/backend/drm/atomic.c +++ b/backend/drm/atomic.c @@ -95,15 +95,14 @@ static void atomic_add(struct atomic *atom, uint32_t id, uint32_t prop, uint64_t } } -bool create_mode_blob(struct wlr_drm_backend *drm, - struct wlr_drm_connector *conn, +bool create_mode_blob(struct wlr_drm_connector *conn, const struct wlr_drm_connector_state *state, uint32_t *blob_id) { if (!state->active) { *blob_id = 0; return true; } - if (drmModeCreatePropertyBlob(drm->fd, &state->mode, + if (drmModeCreatePropertyBlob(conn->backend->fd, &state->mode, sizeof(drmModeModeInfo), blob_id)) { wlr_log_errno(WLR_ERROR, "Unable to create mode property blob"); return false; @@ -270,7 +269,7 @@ static bool atomic_crtc_commit(struct wlr_drm_connector *conn, uint32_t mode_id = crtc->mode_id; if (modeset) { - if (!create_mode_blob(drm, conn, state, &mode_id)) { + if (!create_mode_blob(conn, state, &mode_id)) { return false; } } diff --git a/backend/drm/libliftoff.c b/backend/drm/libliftoff.c index c877e7b8..a39f2493 100644 --- a/backend/drm/libliftoff.c +++ b/backend/drm/libliftoff.c @@ -317,7 +317,7 @@ static bool crtc_commit(struct wlr_drm_connector *conn, uint32_t mode_id = crtc->mode_id; if (modeset) { - if (!create_mode_blob(drm, conn, state, &mode_id)) { + if (!create_mode_blob(conn, state, &mode_id)) { return false; } } diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index dbe4c908..2a90c4b5 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -31,8 +31,7 @@ extern const struct wlr_drm_interface liftoff_iface; bool drm_legacy_crtc_set_gamma(struct wlr_drm_backend *drm, struct wlr_drm_crtc *crtc, size_t size, uint16_t *lut); -bool create_mode_blob(struct wlr_drm_backend *drm, - struct wlr_drm_connector *conn, +bool create_mode_blob(struct wlr_drm_connector *conn, const struct wlr_drm_connector_state *state, uint32_t *blob_id); bool create_gamma_lut_blob(struct wlr_drm_backend *drm, size_t size, const uint16_t *lut, uint32_t *blob_id);