2 files changed, 16 insertions, 26 deletions

diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 6f1abc00..a3a724bc 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -55,16 +55,6 @@ struct wlr_drm_crtc {
 	struct wl_list connectors;
 };
 
-struct wlr_drm_connector {
-	struct wlr_output *base;
-	uint32_t id;
-	struct wlr_drm_crtc *crtc;
-
-	union wlr_drm_connector_props props;
-
-	struct wl_list link;
-};
-
 struct wlr_drm_backend {
 	struct wlr_backend backend;
 
@@ -107,24 +97,24 @@ struct wlr_drm_backend {
 	struct wlr_session *session;
 };
 
-enum wlr_drm_output_state {
-	WLR_DRM_OUTPUT_DISCONNECTED,
-	WLR_DRM_OUTPUT_NEEDS_MODESET,
-	WLR_DRM_OUTPUT_CLEANUP,
-	WLR_DRM_OUTPUT_CONNECTED,
+enum wlr_drm_connector_state {
+	WLR_DRM_CONN_DISCONNECTED,
+	WLR_DRM_CONN_NEEDS_MODESET,
+	WLR_DRM_CONN_CLEANUP,
+	WLR_DRM_CONN_CONNECTED,
 };
 
-struct wlr_drm_output_mode {
+struct wlr_drm_mode {
 	struct wlr_output_mode wlr_mode;
-	drmModeModeInfo mode;
+	drmModeModeInfo drm_mode;
 };
 
-struct wlr_drm_output {
+struct wlr_drm_connector {
 	struct wlr_output output;
 	struct wlr_drm_backend *drm;
 
-	enum wlr_drm_output_state state;
-	uint32_t connector;
+	enum wlr_drm_connector_state state;
+	uint32_t id;
 
 	struct wlr_drm_crtc *crtc;
 	uint32_t possible_crtc;
@@ -144,10 +134,10 @@ bool wlr_drm_check_features(struct wlr_drm_backend *drm);
 bool wlr_drm_resources_init(struct wlr_drm_backend *drm);
 void wlr_drm_resources_free(struct wlr_drm_backend *drm);
 void wlr_drm_restore_outputs(struct wlr_drm_backend *drm);
-void wlr_drm_output_cleanup(struct wlr_drm_output *output);
+void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn);
 void wlr_drm_scan_connectors(struct wlr_drm_backend *state);
 int wlr_drm_event(int fd, uint32_t mask, void *data);
 
-void wlr_drm_output_start_renderer(struct wlr_drm_output *output);
+void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn);
 
 #endif
diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h
index 291b9a30..db1d7ee1 100644
--- a/include/backend/drm/iface.h
+++ b/include/backend/drm/iface.h
@@ -9,17 +9,17 @@
 #include <xf86drmMode.h>
 
 struct wlr_drm_backend;
-struct wlr_drm_output;
+struct wlr_drm_connector;
 struct wlr_drm_crtc;
 
 // Used to provide atomic or legacy DRM functions
 struct wlr_drm_interface {
-	// Enable or disable DPMS for output
+	// Enable or disable DPMS for connector
 	void (*conn_enable)(struct wlr_drm_backend *drm,
-		struct wlr_drm_output *output, bool enable);
+		struct wlr_drm_connector *conn, bool enable);
 	// Pageflip on crtc. If mode is non-NULL perform a full modeset using it.
 	bool (*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);
 	// Enable the cursor buffer on crtc. Set bo to NULL to disable
 	bool (*crtc_set_cursor)(struct wlr_drm_backend *drm,