Refactor wlr_backend_state out of DRM backend

1 files changed, 15 insertions, 14 deletions

diff --git a/backend/drm/drm-legacy.c b/backend/drm/drm-legacy.c
index f7adac86..8caca193 100644
--- a/backend/drm/drm-legacy.c
+++ b/backend/drm/drm-legacy.c
@@ -5,38 +5,39 @@
 #include "backend/drm.h"
 #include "backend/drm-util.h"
 
-static bool legacy_crtc_pageflip(struct wlr_backend_state *drm, struct wlr_output_state *output,
-		struct wlr_drm_crtc *crtc, uint32_t fb_id, drmModeModeInfo *mode) {
+static bool legacy_crtc_pageflip(struct wlr_drm_backend *backend,
+		struct wlr_output_state *output, struct wlr_drm_crtc *crtc,
+		uint32_t fb_id, drmModeModeInfo *mode) {
 	if (mode) {
-		drmModeSetCrtc(drm->fd, crtc->id, fb_id, 0, 0,
+		drmModeSetCrtc(backend->fd, crtc->id, fb_id, 0, 0,
 			&output->connector, 1, mode);
 	}
 
-	drmModePageFlip(drm->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
+	drmModePageFlip(backend->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
 
 	return true;
 }
 
-static void legacy_conn_enable(struct wlr_backend_state *drm, struct wlr_output_state *output,
-		bool enable) {
-	drmModeConnectorSetProperty(drm->fd, output->connector, output->props.dpms,
+static void legacy_conn_enable(struct wlr_drm_backend *backend,
+		struct wlr_output_state *output, bool enable) {
+	drmModeConnectorSetProperty(backend->fd, output->connector, output->props.dpms,
 		enable ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF);
 }
 
-bool legacy_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc,
-		struct gbm_bo *bo) {
+bool legacy_crtc_set_cursor(struct wlr_drm_backend *backend,
+		struct wlr_drm_crtc *crtc, struct gbm_bo *bo) {
 	if (!crtc || !crtc->cursor) {
 		return true;
 	}
 
 	if (!bo) {
-		drmModeSetCursor(drm->fd, crtc->id, 0, 0, 0);
+		drmModeSetCursor(backend->fd, crtc->id, 0, 0, 0);
 		return true;
 	}
 
 	struct wlr_drm_plane *plane = crtc->cursor;
 
-	if (drmModeSetCursor(drm->fd, crtc->id, gbm_bo_get_handle(bo).u32,
+	if (drmModeSetCursor(backend->fd, crtc->id, gbm_bo_get_handle(bo).u32,
 			plane->width, plane->height)) {
 		wlr_log_errno(L_ERROR, "Failed to set hardware cursor");
 		return false;
@@ -45,9 +46,9 @@ bool legacy_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *
 	return true;
 }
 
-bool legacy_crtc_move_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc,
-		int x, int y) {
-	return !drmModeMoveCursor(drm->fd, crtc->id, x, y);
+bool legacy_crtc_move_cursor(struct wlr_drm_backend *backend,
+		struct wlr_drm_crtc *crtc, int x, int y) {
+	return !drmModeMoveCursor(backend->fd, crtc->id, x, y);
 }
 
 const struct wlr_drm_interface legacy_iface = {