From 4486b52aa8e5e5273a779908ad8e823fa1bd2812 Mon Sep 17 00:00:00 2001 From: Ilia Bozhinov Date: Mon, 13 Aug 2018 09:37:44 +0300 Subject: [PATCH] move wlr_drm_connector_add_mode to wlr/backend/drm.h --- include/backend/drm/drm.h | 4 ---- include/wlr/backend/drm.h | 6 ++++++ rootston/output.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 416507ea..5d6ff231 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -143,9 +143,5 @@ void restore_drm_outputs(struct wlr_drm_backend *drm); void scan_drm_connectors(struct wlr_drm_backend *state); int handle_drm_event(int fd, uint32_t mask, void *data); void enable_drm_connector(struct wlr_output *output, bool enable); -/** - * Add mode to the list of available modes - */ -bool wlr_drm_connector_add_mode(struct wlr_output *output, const drmModeModeInfo *mode); #endif diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index a8a5525e..5d47647d 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -28,6 +28,12 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, bool wlr_backend_is_drm(struct wlr_backend *backend); bool wlr_output_is_drm(struct wlr_output *output); +/** + * Add mode to the list of available modes + */ +typedef struct _drmModeModeInfo drmModeModeInfo; +bool wlr_drm_connector_add_mode(struct wlr_output *output, const drmModeModeInfo *mode); + struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend); #endif diff --git a/rootston/output.c b/rootston/output.c index 71ccf8bc..d8edf1c2 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -16,7 +17,6 @@ #include "rootston/layers.h" #include "rootston/output.h" #include "rootston/server.h" -#include "backend/drm/drm.h" /** * Rotate a child's position relative to a parent. The parent size is (pw, ph),