aboutsummaryrefslogtreecommitdiff
path: root/backend/drm/drm.c
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-04-06 16:32:01 +0200
committerKenny Levinsen <kl@kl.wtf>2021-04-29 19:51:57 +0200
commit8f90d7f8f51f5d501e3f70ebdab8abfdbfa007b9 (patch)
tree709b3b1918ab20bddbb62f051b15047f72f790c1 /backend/drm/drm.c
parent69d4cf19b54e81111ef68ff46cfe2e23ff122a80 (diff)
backend/drm: take wlr_output_state as arg in crtc_commit
Stop assuming that the state to be applied is in output->pending in crtc_commit. This will allow us to remove ephemeral fields in wlr_drm_crtc, which are used scratch fields to stash temporary per-commit data.
Diffstat (limited to 'backend/drm/drm.c')
-rw-r--r--backend/drm/drm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index e2b4bb3e..df31752d 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -330,7 +330,7 @@ static void drm_plane_set_committed(struct wlr_drm_plane *plane) {
static bool drm_crtc_commit(struct wlr_drm_connector *conn, uint32_t flags) {
struct wlr_drm_backend *drm = conn->backend;
struct wlr_drm_crtc *crtc = conn->crtc;
- bool ok = drm->iface->crtc_commit(drm, conn, flags);
+ bool ok = drm->iface->crtc_commit(drm, conn, &conn->output.pending, flags);
if (ok && !(flags & DRM_MODE_ATOMIC_TEST_ONLY)) {
memcpy(&crtc->current, &crtc->pending, sizeof(struct wlr_drm_crtc_state));
drm_plane_set_committed(crtc->primary);