From 4101b897000602caf04aba8a10c1b4a4b229f4d6 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Sat, 30 Sep 2017 23:31:08 +1300 Subject: Rename wlr_drm_output to wlr_drm_connector --- backend/drm/iface_legacy.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'backend/drm/iface_legacy.c') diff --git a/backend/drm/iface_legacy.c b/backend/drm/iface_legacy.c index ffa8157b..cf73bb87 100644 --- a/backend/drm/iface_legacy.c +++ b/backend/drm/iface_legacy.c @@ -7,18 +7,18 @@ #include "backend/drm/util.h" static bool legacy_crtc_pageflip(struct wlr_drm_backend *drm, - struct wlr_drm_output *output, struct wlr_drm_crtc *crtc, + struct wlr_drm_connector *conn, struct wlr_drm_crtc *crtc, uint32_t fb_id, drmModeModeInfo *mode) { if (mode) { if (drmModeSetCrtc(drm->fd, crtc->id, fb_id, 0, 0, - &output->connector, 1, mode)) { - wlr_log_errno(L_ERROR, "%s: Failed to set CRTC", output->output.name); + &conn->id, 1, mode)) { + wlr_log_errno(L_ERROR, "%s: Failed to set CRTC", conn->output.name); return false; } } - if (drmModePageFlip(drm->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output)) { - wlr_log_errno(L_ERROR, "%s: Failed to page flip", output->output.name); + if (drmModePageFlip(drm->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, conn)) { + wlr_log_errno(L_ERROR, "%s: Failed to page flip", conn->output.name); return false; } @@ -26,8 +26,8 @@ static bool legacy_crtc_pageflip(struct wlr_drm_backend *drm, } static void legacy_conn_enable(struct wlr_drm_backend *drm, - struct wlr_drm_output *output, bool enable) { - drmModeConnectorSetProperty(drm->fd, output->connector, output->props.dpms, + struct wlr_drm_connector *conn, bool enable) { + drmModeConnectorSetProperty(drm->fd, conn->id, conn->props.dpms, enable ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF); } -- cgit v1.2.3