From 601bbad5d83387336028c5a721e8e85fccbbf844 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Thu, 20 Jul 2017 13:37:07 +1200
Subject: [PATCH 01/16] Added DRM property infrastructure

---
 backend/drm/drm-properties.c | 99 ++++++++++++++++++++++++++++++++++++
 backend/drm/drm-properties.h | 59 +++++++++++++++++++++
 2 files changed, 158 insertions(+)
 create mode 100644 backend/drm/drm-properties.c
 create mode 100644 backend/drm/drm-properties.h

diff --git a/backend/drm/drm-properties.c b/backend/drm/drm-properties.c
new file mode 100644
index 00000000..3e089c31
--- /dev/null
+++ b/backend/drm/drm-properties.c
@@ -0,0 +1,99 @@
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <wlr/util/log.h>
+#include "drm-properties.h"
+
+/*
+ * Creates a mapping between property names and an array index where to store
+ * the ids.  The prop_info arrays must be sorted by name, as bsearch is used to
+ * search them.
+ */
+struct prop_info {
+	const char *name;
+	size_t index;
+};
+
+static const struct prop_info connector_info[] = {
+#define INDEX(name) (offsetof(union wlr_drm_connector_props, name) / sizeof(uint32_t))
+	{ "CRTC_ID", INDEX(crtc_id) },
+	{ "DPMS",    INDEX(dpms) },
+	{ "EDID",    INDEX(edid) },
+#undef INDEX
+};
+
+static const struct prop_info crtc_info[] = {
+#define INDEX(name) (offsetof(union wlr_drm_crtc_props, name) / sizeof(uint32_t))
+	{ "rotation",  INDEX(rotation) },
+	{ "scaling mode", INDEX(scaling_mode) },
+#undef INDEX
+};
+
+static const struct prop_info plane_info[] = {
+#define INDEX(name) (offsetof(union wlr_drm_plane_props, name) / sizeof(uint32_t))
+	{ "CRTC_H",  INDEX(crtc_h) },
+	{ "CRTC_ID", INDEX(crtc_id) },
+	{ "CRTC_W",  INDEX(crtc_w) },
+	{ "CRTC_X",  INDEX(crtc_x) },
+	{ "CRTC_Y",  INDEX(crtc_y) },
+	{ "FB_ID",   INDEX(fb_id) },
+	{ "SRC_H",   INDEX(src_h) },
+	{ "SRC_W",   INDEX(src_w) },
+	{ "SRC_X",   INDEX(src_x) },
+	{ "SRC_Y",   INDEX(src_y) },
+	{ "type",    INDEX(type) },
+#undef INDEX
+};
+
+static int cmp_prop_info(const void *arg1, const void *arg2) {
+	const struct prop_info *a = arg1;
+	const struct prop_info *b = arg2;
+
+	return strcmp(a->name, b->name);
+}
+
+static bool scan_properties(int fd, uint32_t id, uint32_t type, uint32_t *result,
+		const struct prop_info *info, size_t info_len) {
+	drmModeObjectProperties *props = drmModeObjectGetProperties(fd, id, type);
+	if (!props) {
+		wlr_log_errno(L_ERROR, "Failed to get DRM object properties");
+		return false;
+	}
+
+	for (uint32_t i = 0; i < props->count_props; ++i) {
+		drmModePropertyRes *prop = drmModeGetProperty(fd, props->props[i]);
+		if (!prop) {
+			wlr_log_errno(L_ERROR, "Failed to get DRM object property");
+			continue;
+		}
+
+		const struct prop_info *p =
+			bsearch(prop->name, info, info_len, sizeof(info[0]), cmp_prop_info);
+		if (p) {
+			result[p->index] = prop->prop_id;
+		}
+
+		drmModeFreeProperty(prop);
+	}
+
+	drmModeFreeObjectProperties(props);
+	return true;
+}
+
+bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out) {
+	return scan_properties(fd, id, DRM_MODE_OBJECT_CONNECTOR, out->props,
+		connector_info, sizeof(connector_info) / sizeof(connector_info[0]));
+}
+
+bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out) {
+	return scan_properties(fd, id, DRM_MODE_OBJECT_CRTC, out->props,
+		crtc_info, sizeof(crtc_info) / sizeof(crtc_info[0]));
+}
+
+bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out) {
+	return scan_properties(fd, id, DRM_MODE_OBJECT_PLANE, out->props,
+		plane_info, sizeof(plane_info) / sizeof(plane_info[0]));
+}
diff --git a/backend/drm/drm-properties.h b/backend/drm/drm-properties.h
new file mode 100644
index 00000000..99791958
--- /dev/null
+++ b/backend/drm/drm-properties.h
@@ -0,0 +1,59 @@
+#ifndef DRM_PROPERTIES_H
+#define DRM_PROPERTIES_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+/*
+ * These types contain the property ids for several DRM objects.
+ * See https://01.org/linuxgraphics/gfx-docs/drm/drm-kms-properties.html
+ * for more details.
+ */
+
+union wlr_drm_connector_props {
+	struct {
+		uint32_t edid;
+		uint32_t dpms;
+
+		// atomic-modesetting only
+
+		uint32_t crtc_id;
+	};
+	uint32_t props[3];
+};
+
+union wlr_drm_crtc_props {
+	struct {
+		// Neither of these are guranteed to exist
+		uint32_t rotation;
+		uint32_t scaling_mode;
+	};
+	uint32_t props[2];
+};
+
+union wlr_drm_plane_props {
+	struct {
+		uint32_t type;
+		uint32_t rotation; // Not guranteed to exist
+
+		// atomic-modesetting only
+
+		uint32_t src_x;
+		uint32_t src_y;
+		uint32_t src_w;
+		uint32_t src_h;
+		uint32_t crtc_x;
+		uint32_t crtc_y;
+		uint32_t crtc_w;
+		uint32_t crtc_h;
+		uint32_t fb_id;
+		uint32_t crtc_id;
+	};
+	uint32_t props[12];
+};
+
+bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out);
+bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out);
+bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out);
+
+#endif

From 7b772e1a4b8c7a06fbcf0ec57766af3a5384bf0c Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Thu, 20 Jul 2017 20:51:59 +1200
Subject: [PATCH 02/16] DRM resource initalisation

---
 backend/drm/backend.c                  |  13 ++-
 backend/drm/drm-properties.c           |  50 +++++++++-
 backend/drm/drm-properties.h           |   5 +-
 backend/drm/drm.c                      | 133 ++++++++++++++++++++++++-
 {include/backend => backend/drm}/drm.h |  46 ++++++++-
 5 files changed, 238 insertions(+), 9 deletions(-)
 rename {include/backend => backend/drm}/drm.h (68%)

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index a2c71317..4abcc817 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -12,8 +12,8 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/list.h>
 #include <wlr/util/log.h>
-#include "backend/udev.h"
-#include "backend/drm.h"
+#include <backend/udev.h>
+#include "drm.h"
 
 static bool wlr_drm_backend_init(struct wlr_backend_state *state) {
 	wlr_drm_scan_connectors(state);
@@ -131,6 +131,15 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 	state->session_signal.notify = session_signal;
 	wl_signal_add(&session->session_signal, &state->session_signal);
 
+	if (drmSetClientCap(state->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
+		wlr_log(L_INFO, "DRM universal planes unsupported");
+	}
+	if (drmSetClientCap(state->fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
+		wlr_log(L_INFO, "Atomic modesetting unsupported");
+	}
+
+	wlr_drm_init_resources(state);
+
 	// TODO: what is the difference between the per-output renderer and this
 	// one?
 	if (!wlr_drm_renderer_init(&state->renderer, state->fd)) {
diff --git a/backend/drm/drm-properties.c b/backend/drm/drm-properties.c
index 3e089c31..9310ffdd 100644
--- a/backend/drm/drm-properties.c
+++ b/backend/drm/drm-properties.c
@@ -49,10 +49,10 @@ static const struct prop_info plane_info[] = {
 };
 
 static int cmp_prop_info(const void *arg1, const void *arg2) {
-	const struct prop_info *a = arg1;
-	const struct prop_info *b = arg2;
+	const char *key = arg1;
+	const struct prop_info *elem = arg2;
 
-	return strcmp(a->name, b->name);
+	return strcmp(key, elem->name);
 }
 
 static bool scan_properties(int fd, uint32_t id, uint32_t type, uint32_t *result,
@@ -97,3 +97,47 @@ bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out
 	return scan_properties(fd, id, DRM_MODE_OBJECT_PLANE, out->props,
 		plane_info, sizeof(plane_info) / sizeof(plane_info[0]));
 }
+
+bool wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret) {
+	drmModeObjectProperties *props = drmModeObjectGetProperties(fd, obj, DRM_MODE_OBJECT_ANY);
+	if (!props) {
+		return false;
+	}
+
+	bool found = false;
+
+	for (uint32_t i = 0; i < props->count_props; ++i) {
+		if (props->props[i] == prop) {
+			*ret = props->prop_values[i];
+			found = true;
+			break;
+		}
+	}
+
+	drmModeFreeObjectProperties(props);
+	return found;
+}
+
+void *wlr_drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len) {
+	uint64_t blob_id;
+	if (!wlr_drm_get_prop(fd, obj, prop, &blob_id)) {
+		return NULL;
+	}
+
+	drmModePropertyBlobRes *blob = drmModeGetPropertyBlob(fd, blob_id);
+	if (!blob) {
+		return NULL;
+	}
+
+	void *ptr = malloc(blob->length);
+	if (!ptr) {
+		drmModeFreePropertyBlob(blob);
+		return NULL;
+	}
+
+	memcpy(ptr, blob->data, blob->length);
+	*ret_len = blob->length;
+
+	drmModeFreePropertyBlob(blob);
+	return ptr;
+}
diff --git a/backend/drm/drm-properties.h b/backend/drm/drm-properties.h
index 99791958..287fc1e0 100644
--- a/backend/drm/drm-properties.h
+++ b/backend/drm/drm-properties.h
@@ -6,7 +6,7 @@
 
 /*
  * These types contain the property ids for several DRM objects.
- * See https://01.org/linuxgraphics/gfx-docs/drm/drm-kms-properties.html
+ * See https://01.org/linuxgraphics/gfx-docs/drm/gpu/drm-kms.html#kms-properties
  * for more details.
  */
 
@@ -56,4 +56,7 @@ bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_pr
 bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out);
 bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out);
 
+bool wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret);
+void *wlr_drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len);
+
 #endif
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 6e969788..7c27c046 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -15,7 +15,7 @@
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
-#include "backend/drm.h"
+#include "drm.h"
 
 static const char *conn_name[] = {
 	[DRM_MODE_CONNECTOR_Unknown]     = "Unknown",
@@ -37,6 +37,137 @@ static const char *conn_name[] = {
 	[DRM_MODE_CONNECTOR_DSI]         = "DSI",
 };
 
+static int cmp_plane(const void *arg1, const void *arg2)
+{
+	const struct wlr_drm_plane *a = arg1;
+	const struct wlr_drm_plane *b = arg2;
+
+	return (int)a->type - (int)b->type;
+}
+
+static bool init_planes(struct wlr_backend_state *drm)
+{
+	drmModePlaneRes *plane_res = drmModeGetPlaneResources(drm->fd);
+	if (!plane_res) {
+		wlr_log_errno(L_ERROR, "Failed to get DRM plane resources");
+		return false;
+	}
+
+	wlr_log(L_INFO, "Found %"PRIu32" DRM planes", plane_res->count_planes);
+
+	if (plane_res->count_planes == 0) {
+		drmModeFreePlaneResources(plane_res);
+		return true;
+	}
+
+	size_t num_planes = plane_res->count_planes;
+	struct wlr_drm_plane *planes = calloc(num_planes, sizeof(*planes));
+	if (!planes) {
+		wlr_log_errno(L_ERROR, "Allocation failed");
+		goto error_res;
+	}
+
+	size_t num_overlay = 0;
+	size_t num_primary = 0;
+	size_t num_cursor = 0;
+
+	for (size_t i = 0; i < num_planes; ++i) {
+		struct wlr_drm_plane *p = &planes[i];
+
+		drmModePlane *plane = drmModeGetPlane(drm->fd, plane_res->planes[i]);
+		if (!plane) {
+			wlr_log_errno(L_ERROR, "Failed to get DRM plane");
+			goto error_planes;
+		}
+
+		p->id = plane->plane_id;
+		p->possible_crtcs = plane->possible_crtcs;
+		uint64_t type;
+
+		if (!wlr_drm_get_plane_props(drm->fd, p->id, &p->props) ||
+				!wlr_drm_get_prop(drm->fd, p->id, p->props.type, &type)) {
+			drmModeFreePlane(plane);
+			goto error_planes;
+		}
+
+		p->type = type;
+
+		switch (type) {
+		case DRM_PLANE_TYPE_OVERLAY:
+			++num_overlay;
+			break;
+		case DRM_PLANE_TYPE_PRIMARY:
+			++num_primary;
+			break;
+		case DRM_PLANE_TYPE_CURSOR:
+			++num_cursor;
+			break;
+		}
+
+		drmModeFreePlane(plane);
+	}
+
+	wlr_log(L_INFO, "(%zu overlay, %zu primary, %zu cursor)",
+		num_overlay, num_primary, num_cursor);
+
+	qsort(planes, num_planes, sizeof(*planes), cmp_plane);
+
+	drm->num_planes = num_planes;
+	drm->num_overlay_planes = num_overlay;
+	drm->num_primary_planes = num_primary;
+	drm->num_cursor_planes = num_cursor;
+
+	drm->planes = planes;
+	drm->overlay_planes = planes;
+	drm->primary_planes = planes + num_overlay;
+	drm->cursor_planes = planes + num_overlay + num_primary;
+
+	return true;
+
+error_planes:
+	free(planes);
+error_res:
+	drmModeFreePlaneResources(plane_res);
+	return false;
+}
+
+bool wlr_drm_init_resources(struct wlr_backend_state *drm) {
+	drmModeRes *res = drmModeGetResources(drm->fd);
+	if (!res) {
+		wlr_log_errno(L_ERROR, "Failed to get DRM resources");
+		return false;
+	}
+
+	wlr_log(L_INFO, "Found %d DRM CRTCs", res->count_crtcs);
+
+	drm->num_crtcs = res->count_crtcs;
+	drm->crtcs = calloc(drm->num_crtcs, sizeof(drm->crtcs[0]));
+	if (!drm->crtcs) {
+		wlr_log_errno(L_ERROR, "Allocation failed");
+		goto error_res;
+	}
+
+	for (size_t i = 0; i < drm->num_crtcs; ++i) {
+		struct wlr_drm_crtc *crtc = &drm->crtcs[i];
+		crtc->id = res->crtcs[i];
+		wlr_drm_get_crtc_props(drm->fd, crtc->id, &crtc->props);
+	}
+
+	if (!init_planes(drm)) {
+		goto error_crtcs;
+	}
+
+	drmModeFreeResources(res);
+
+	return true;
+
+error_crtcs:
+	free(drm->crtcs);
+error_res:
+	drmModeFreeResources(res);
+	return false;
+}
+
 bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
 	renderer->gbm = gbm_create_device(fd);
 	if (!renderer->gbm) {
diff --git a/include/backend/drm.h b/backend/drm/drm.h
similarity index 68%
rename from include/backend/drm.h
rename to backend/drm/drm.h
index ecdd945b..c5d32254 100644
--- a/include/backend/drm.h
+++ b/backend/drm/drm.h
@@ -14,8 +14,37 @@
 #include <wlr/backend/drm.h>
 #include <wlr/util/list.h>
 
-#include "backend/egl.h"
-#include "backend/udev.h"
+#include <backend/egl.h>
+#include <backend/udev.h>
+#include "drm-properties.h"
+
+struct wlr_drm_plane {
+	uint32_t type;
+	uint32_t id;
+	uint32_t fb_id;
+
+	uint32_t possible_crtcs;
+
+	int32_t x, y;
+	uint32_t width, height;
+
+	struct gbm_surface *gbm;
+	EGLSurface egl;
+
+	struct gbm_bo *front;
+	struct gbm_bo *back;
+
+	union wlr_drm_plane_props props;
+};
+
+struct wlr_drm_crtc {
+	uint32_t id;
+	struct wlr_drm_plane *primary;
+	struct wlr_drm_plane *overlay;
+	struct wlr_drm_plane *cursor;
+	
+	union wlr_drm_crtc_props props;
+};
 
 struct wlr_drm_renderer {
 	int fd;
@@ -30,6 +59,18 @@ struct wlr_backend_state {
 	int fd;
 	dev_t dev;
 
+	size_t num_crtcs;
+	struct wlr_drm_crtc *crtcs;
+	size_t num_planes;
+	struct wlr_drm_plane *planes;
+
+	size_t num_overlay_planes;
+	struct wlr_drm_plane *overlay_planes;
+	size_t num_primary_planes;
+	struct wlr_drm_plane *primary_planes;
+	size_t num_cursor_planes;
+	struct wlr_drm_plane *cursor_planes;
+
 	struct wlr_backend *backend;
 	struct wl_display *display;
 	struct wl_event_source *drm_event;
@@ -83,6 +124,7 @@ struct wlr_output_state {
 	bool cleanup;
 };
 
+bool wlr_drm_init_resources(struct wlr_backend_state *drm);
 void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore);
 
 void wlr_drm_scan_connectors(struct wlr_backend_state *state);

From 31867a1b2e7c83d5148b548290beb0e7b6206df1 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Thu, 20 Jul 2017 23:26:53 +1200
Subject: [PATCH 03/16] Various changes/cleanups

---
 backend/drm/backend.c |   4 +-
 backend/drm/drm.c     | 220 ++++++++++++++++++------------------------
 backend/drm/drm.h     |  27 ++++--
 3 files changed, 117 insertions(+), 134 deletions(-)

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 4abcc817..6f5b0596 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -26,7 +26,7 @@ static void wlr_drm_backend_destroy(struct wlr_backend_state *state) {
 	}
 	for (size_t i = 0; state->outputs && i < state->outputs->length; ++i) {
 		struct wlr_output_state *output = state->outputs->items[i];
-		wlr_output_destroy(output->wlr_output);
+		wlr_output_destroy(output->base);
 	}
 	wlr_udev_signal_remove(state->udev, &state->drm_invalidated);
 	wlr_drm_renderer_free(&state->renderer);
@@ -98,7 +98,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 		return NULL;
 	}
 
-	state->backend = backend;
+	state->base = backend;
 	state->session = session;
 	state->udev = udev;
 	state->outputs = list_create();
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 7c27c046..ca63a46a 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -248,7 +248,7 @@ static void wlr_drm_output_swap_buffers(struct wlr_output_state *output) {
 }
 
 void wlr_drm_output_pause_renderer(struct wlr_output_state *output) {
-	if (output->state != DRM_OUTPUT_CONNECTED) {
+	if (output->state != WLR_DRM_OUTPUT_CONNECTED) {
 		return;
 	}
 
@@ -263,12 +263,12 @@ void wlr_drm_output_pause_renderer(struct wlr_output_state *output) {
 }
 
 void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
-	if (output->state != DRM_OUTPUT_CONNECTED) {
+	if (output->state != WLR_DRM_OUTPUT_CONNECTED) {
 		return;
 	}
 
 	struct wlr_drm_renderer *renderer = output->renderer;
-	struct wlr_output_mode *mode = output->wlr_output->current_mode;
+	struct wlr_output_mode *mode = output->base->current_mode;
 
 	// Render black frame
 	eglMakeCurrent(renderer->egl.display, output->egl, output->egl, renderer->egl.context);
@@ -293,19 +293,19 @@ void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
 
 static bool display_init_renderer(struct wlr_drm_renderer *renderer,
 	struct wlr_output_state *output) {
-	struct wlr_output_mode *mode = output->wlr_output->current_mode;
+	struct wlr_output_mode *mode = output->base->current_mode;
 	output->renderer = renderer;
 	output->gbm = gbm_surface_create(renderer->gbm, mode->width,
 		mode->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
 	if (!output->gbm) {
-		wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", output->wlr_output->name,
+		wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", output->base->name,
 			strerror(errno));
 		return false;
 	}
 
 	output->egl = wlr_egl_create_surface(&renderer->egl, output->gbm);
 	if (output->egl == EGL_NO_SURFACE) {
-		wlr_log(L_ERROR, "Failed to create EGL surface for %s", output->wlr_output->name);
+		wlr_log(L_ERROR, "Failed to create EGL surface for %s", output->base->name);
 		return false;
 	}
 
@@ -329,7 +329,7 @@ static int find_id(const void *item, const void *cmp_to) {
 static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable) {
 	struct wlr_backend_state *state =
 		wl_container_of(output->renderer, state, renderer);
-	if (output->state != DRM_OUTPUT_CONNECTED) {
+	if (output->state != WLR_DRM_OUTPUT_CONNECTED) {
 		return;
 	}
 
@@ -353,7 +353,7 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	struct wlr_backend_state *state =
 		wl_container_of(output->renderer, state, renderer);
 
-	wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", output->wlr_output->name,
+	wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", output->base->name,
 			mode->width, mode->height, mode->refresh);
 
 	drmModeConnector *conn = drmModeGetConnector(state->fd, output->connector);
@@ -363,7 +363,7 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	}
 
 	if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) {
-		wlr_log(L_ERROR, "%s is not connected", output->wlr_output->name);
+		wlr_log(L_ERROR, "%s is not connected", output->base->name);
 		goto error;
 	}
 
@@ -398,18 +398,18 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	drmModeFreeResources(res);
 
 	if (!success) {
-		wlr_log(L_ERROR, "Failed to find CRTC for %s", output->wlr_output->name);
+		wlr_log(L_ERROR, "Failed to find CRTC for %s", output->base->name);
 		goto error;
 	}
 
-	output->state = DRM_OUTPUT_CONNECTED;
-	output->width = output->wlr_output->width = mode->width;
-	output->height = output->wlr_output->height = mode->height;
-	output->wlr_output->current_mode = mode;
-	wl_signal_emit(&output->wlr_output->events.resolution, output->wlr_output);
+	output->state = WLR_DRM_OUTPUT_CONNECTED;
+	output->width = output->base->width = mode->width;
+	output->height = output->base->height = mode->height;
+	output->base->current_mode = mode;
+	wl_signal_emit(&output->base->events.resolution, output->base);
 
 	if (!display_init_renderer(&state->renderer, output)) {
-		wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->wlr_output->name);
+		wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->base->name);
 		goto error;
 	}
 
@@ -424,7 +424,7 @@ error:
 
 static void wlr_drm_output_transform(struct wlr_output_state *output,
 		enum wl_output_transform transform) {
-	output->wlr_output->transform = transform;
+	output->base->transform = transform;
 }
 
 static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
@@ -533,7 +533,7 @@ static int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
 }
 
 // Constructed from http://edid.tv/manufacturer
-const char *get_manufacturer(uint16_t id) {
+static const char *get_manufacturer(uint16_t id) {
 #define ID(a, b, c) ((a & 0x1f) << 10) | ((b & 0x1f) << 5) | (c & 0x1f)
 	switch (id) {
 	case ID('A', 'A', 'A'): return "Avolites Ltd";
@@ -590,8 +590,14 @@ const char *get_manufacturer(uint16_t id) {
 /* See https://en.wikipedia.org/wiki/Extended_Display_Identification_Data for layout of EDID data.
  * We don't parse the EDID properly. We just expect to receive valid data.
  */
-static void parse_edid(struct wlr_output *restrict output, const uint8_t *restrict data) {
-	uint32_t id = (data[8] << 8) | data[9];
+static void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data) {
+	if (!data || len < 128) {
+		snprintf(output->make, sizeof(output->make), "<Unknown>");
+		snprintf(output->model, sizeof(output->model), "<Unknown>");
+		return;
+	}
+
+	uint16_t id = (data[8] << 8) | data[9];
 	snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id));
 
 	output->phys_width = ((data[68] & 0xf0) << 4) | data[66];
@@ -613,121 +619,87 @@ static void parse_edid(struct wlr_output *restrict output, const uint8_t *restri
 	}
 }
 
-static void scan_property_ids(int fd, drmModeConnector *conn,
-		struct wlr_output_state *output) {
-	for (int i = 0; i < conn->count_props; ++i) {
-		drmModePropertyRes *prop = drmModeGetProperty(fd, conn->props[i]);
-		if (!prop) {
-			continue;
-		}
+static const int32_t subpixel_map[] = {
+	[DRM_MODE_SUBPIXEL_UNKNOWN] = WL_OUTPUT_SUBPIXEL_UNKNOWN,
+	[DRM_MODE_SUBPIXEL_HORIZONTAL_RGB] = WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB,
+	[DRM_MODE_SUBPIXEL_HORIZONTAL_BGR] = WL_OUTPUT_SUBPIXEL_HORIZONTAL_BGR,
+	[DRM_MODE_SUBPIXEL_VERTICAL_RGB] = WL_OUTPUT_SUBPIXEL_VERTICAL_RGB,
+	[DRM_MODE_SUBPIXEL_VERTICAL_BGR] = WL_OUTPUT_SUBPIXEL_VERTICAL_BGR,
+	[DRM_MODE_SUBPIXEL_NONE] = WL_OUTPUT_SUBPIXEL_NONE,
+};
 
-		if (strcmp(prop->name, "DPMS") == 0) {
-			output->props.dpms = prop->prop_id;
-		} else if (strcmp(prop->name, "EDID") == 0) {
-			drmModePropertyBlobRes *edid = drmModeGetPropertyBlob(fd, conn->prop_values[i]);
-			if (!edid) {
-				drmModeFreeProperty(prop);
-				continue;
-			}
-
-			parse_edid(output->wlr_output, edid->data);
-
-			drmModeFreePropertyBlob(edid);
-		}
-
-		drmModeFreeProperty(prop);
-	}
-}
-
-void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
+void wlr_drm_scan_connectors(struct wlr_backend_state *drm) {
 	wlr_log(L_INFO, "Scanning DRM connectors");
 
-	drmModeRes *res = drmModeGetResources(state->fd);
+	drmModeRes *res = drmModeGetResources(drm->fd);
 	if (!res) {
-		wlr_log(L_ERROR, "Failed to get DRM resources");
+		wlr_log_errno(L_ERROR, "Failed to get DRM resources");
 		return;
 	}
 
 	for (int i = 0; i < res->count_connectors; ++i) {
-		uint32_t id = res->connectors[i];
-
-		drmModeConnector *conn = drmModeGetConnector(state->fd, id);
+		drmModeConnector *conn = drmModeGetConnector(drm->fd,
+			res->connectors[i]);
 		if (!conn) {
-			wlr_log(L_ERROR, "Failed to get DRM connector");
+			wlr_log_errno(L_ERROR, "Failed to get DRM connector");
 			continue;
 		}
 
 		struct wlr_output_state *output;
-		struct wlr_output *wlr_output;
-		int index = list_seq_find(state->outputs, find_id, &id);
+		int index = list_seq_find(drm->outputs, find_id, &conn->connector_id);
 
 		if (index == -1) {
-			output = calloc(1, sizeof(struct wlr_output_state));
-			if (!state) {
+			output = calloc(1, sizeof(*output));
+			if (!output) {
+				wlr_log_errno(L_ERROR, "Allocation failed");
 				drmModeFreeConnector(conn);
-				wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
-				return;
-			}
-			wlr_output = output->wlr_output = wlr_output_create(&output_impl, output);
-			if (!wlr_output) {
-				drmModeFreeConnector(conn);
-				wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
-				return;
+				continue;
 			}
 
-			output->renderer = &state->renderer;
-			output->state = DRM_OUTPUT_DISCONNECTED;
-			output->connector = id;
-			// TODO: Populate more wlr_output fields
-			// TODO: Move this to wlr_output->name
-			snprintf(wlr_output->name, sizeof(wlr_output->name), "%s-%"PRIu32,
+			output->base = wlr_output_create(&output_impl, output);
+			if (!output->base) {
+				wlr_log_errno(L_ERROR, "Allocation failed");
+				drmModeFreeConnector(conn);
+				free(output);
+				continue;
+			}
+
+			output->renderer = &drm->renderer;
+			output->state = WLR_DRM_OUTPUT_DISCONNECTED;
+			output->connector = conn->connector_id;
+
+			drmModeEncoder *curr_enc = drmModeGetEncoder(drm->fd, conn->encoder_id);
+			if (curr_enc) {
+				output->old_crtc = drmModeGetCrtc(drm->fd, curr_enc->crtc_id);
+				drmModeFreeEncoder(curr_enc);
+			}
+
+			output->base->phys_width = conn->mmWidth;
+			output->base->phys_height = conn->mmHeight;
+			output->base->subpixel = subpixel_map[conn->subpixel];
+			snprintf(output->base->name, sizeof(output->base->name), "%s-%"PRIu32,
 				 conn_name[conn->connector_type],
 				 conn->connector_type_id);
-			wlr_output->phys_width = conn->mmWidth;
-			wlr_output->phys_height = conn->mmHeight;
-			switch (conn->subpixel) {
-			case DRM_MODE_SUBPIXEL_UNKNOWN:
-				wlr_output->subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
-				break;
-			case DRM_MODE_SUBPIXEL_HORIZONTAL_RGB:
-				wlr_output->subpixel = WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB;
-				break;
-			case DRM_MODE_SUBPIXEL_HORIZONTAL_BGR:
-				wlr_output->subpixel = WL_OUTPUT_SUBPIXEL_HORIZONTAL_BGR;
-				break;
-			case DRM_MODE_SUBPIXEL_VERTICAL_RGB:
-				wlr_output->subpixel = WL_OUTPUT_SUBPIXEL_VERTICAL_RGB;
-				break;
-			case DRM_MODE_SUBPIXEL_VERTICAL_BGR:
-				wlr_output->subpixel = WL_OUTPUT_SUBPIXEL_VERTICAL_BGR;
-				break;
-			case DRM_MODE_SUBPIXEL_NONE:
-			default:
-				wlr_output->subpixel = WL_OUTPUT_SUBPIXEL_NONE;
-				break;
-			}
 
-			drmModeEncoder *curr_enc = drmModeGetEncoder(state->fd, conn->encoder_id);
-			if (curr_enc) {
-				output->old_crtc = drmModeGetCrtc(state->fd, curr_enc->crtc_id);
-				free(curr_enc);
-			}
+			wlr_drm_get_connector_props(drm->fd, output->connector, &output->props);
 
-			scan_property_ids(state->fd, conn, output);
+			size_t edid_len = 0;
+			uint8_t *edid = wlr_drm_get_prop_blob(drm->fd, output->connector,
+				output->props.edid, &edid_len);
+			parse_edid(output->base, edid_len, edid);
+			free(edid);
 
-			wlr_output_create_global(wlr_output, state->display);
-			list_add(state->outputs, output);
-			wlr_log(L_INFO, "Found display '%s'", wlr_output->name);
+			wlr_output_create_global(output->base, drm->display);
+			list_add(drm->outputs, output);
+			wlr_log(L_INFO, "Found display '%s'", output->base->name);
 		} else {
-			output = state->outputs->items[index];
-			wlr_output = output->wlr_output;
+			output = drm->outputs->items[index];
 		}
 
-		// TODO: move state into wlr_output
-		if (output->state == DRM_OUTPUT_DISCONNECTED &&
-			conn->connection == DRM_MODE_CONNECTED) {
+		if (output->state == WLR_DRM_OUTPUT_DISCONNECTED &&
+				conn->connection == DRM_MODE_CONNECTED) {
 
-			wlr_log(L_INFO, "'%s' connected", output->wlr_output->name);
+			wlr_log(L_INFO, "'%s' connected", output->base->name);
 			wlr_log(L_INFO, "Detected modes:");
 
 			for (int i = 0; i < conn->count_modes; ++i) {
@@ -744,16 +716,16 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
 				wlr_log(L_INFO, "  %"PRId32"@%"PRId32"@%"PRId32,
 					mode->width, mode->height, mode->refresh);
 
-				list_add(wlr_output->modes, mode);
+				list_add(output->base->modes, mode);
 			}
 
-			output->state = DRM_OUTPUT_NEEDS_MODESET;
-			wlr_log(L_INFO, "Sending modesetting signal for '%s'", output->wlr_output->name);
-			wl_signal_emit(&state->backend->events.output_add, wlr_output);
-		} else if (output->state == DRM_OUTPUT_CONNECTED &&
-			conn->connection != DRM_MODE_CONNECTED) {
+			output->state = WLR_DRM_OUTPUT_NEEDS_MODESET;
+			wlr_log(L_INFO, "Sending modesetting signal for '%s'", output->base->name);
+			wl_signal_emit(&drm->base->events.output_add, output->base);
+		} else if (output->state == WLR_DRM_OUTPUT_CONNECTED &&
+				conn->connection != DRM_MODE_CONNECTED) {
 
-			wlr_log(L_INFO, "'%s' disconnected", output->wlr_output->name);
+			wlr_log(L_INFO, "'%s' disconnected", output->base->name);
 			wlr_drm_output_cleanup(output, false);
 		}
 
@@ -775,8 +747,8 @@ static void page_flip_handler(int fd, unsigned seq,
 	}
 
 	output->pageflip_pending = false;
-	if (output->state == DRM_OUTPUT_CONNECTED && state->session->active) {
-		wl_signal_emit(&output->wlr_output->events.frame, output->wlr_output);
+	if (output->state == WLR_DRM_OUTPUT_CONNECTED && state->session->active) {
+		wl_signal_emit(&output->base->events.frame, output->base);
 	}
 }
 
@@ -815,8 +787,8 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 	struct wlr_backend_state *state = wl_container_of(renderer, state, renderer);
 
 	switch (output->state) {
-	case DRM_OUTPUT_CONNECTED:
-		output->state = DRM_OUTPUT_DISCONNECTED;
+	case WLR_DRM_OUTPUT_CONNECTED:
+		output->state = WLR_DRM_OUTPUT_DISCONNECTED;
 		if (restore) {
 			restore_output(output, renderer->fd);
 			restore = false;
@@ -826,15 +798,15 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 		output->egl = EGL_NO_SURFACE;
 		output->gbm = NULL;
 		/* Fallthrough */
-	case DRM_OUTPUT_NEEDS_MODESET:
-		output->state = DRM_OUTPUT_DISCONNECTED;
+	case WLR_DRM_OUTPUT_NEEDS_MODESET:
+		output->state = WLR_DRM_OUTPUT_DISCONNECTED;
 		if (restore) {
 			restore_output(output, renderer->fd);
 		}
-		wlr_log(L_INFO, "Emmiting destruction signal for '%s'", output->wlr_output->name);
-		wl_signal_emit(&state->backend->events.output_remove, output->wlr_output);
+		wlr_log(L_INFO, "Emmiting destruction signal for '%s'", output->base->name);
+		wl_signal_emit(&state->base->events.output_remove, output->base);
 		break;
-	case DRM_OUTPUT_DISCONNECTED:
+	case WLR_DRM_OUTPUT_DISCONNECTED:
 		break;
 	}
 }
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index c5d32254..2f79417a 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -44,6 +44,18 @@ struct wlr_drm_crtc {
 	struct wlr_drm_plane *cursor;
 	
 	union wlr_drm_crtc_props props;
+
+	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_renderer {
@@ -56,6 +68,8 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd);
 void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer);
 
 struct wlr_backend_state {
+	struct wlr_backend *base;
+
 	int fd;
 	dev_t dev;
 
@@ -71,7 +85,6 @@ struct wlr_backend_state {
 	size_t num_cursor_planes;
 	struct wlr_drm_plane *cursor_planes;
 
-	struct wlr_backend *backend;
 	struct wl_display *display;
 	struct wl_event_source *drm_event;
 
@@ -87,9 +100,9 @@ struct wlr_backend_state {
 };
 
 enum wlr_drm_output_state {
-	DRM_OUTPUT_DISCONNECTED,
-	DRM_OUTPUT_NEEDS_MODESET,
-	DRM_OUTPUT_CONNECTED,
+	WLR_DRM_OUTPUT_DISCONNECTED,
+	WLR_DRM_OUTPUT_NEEDS_MODESET,
+	WLR_DRM_OUTPUT_CONNECTED,
 };
 
 struct wlr_output_mode_state {
@@ -98,13 +111,11 @@ struct wlr_output_mode_state {
 };
 
 struct wlr_output_state {
-	struct wlr_output *wlr_output;
+	struct wlr_output *base;
 	enum wlr_drm_output_state state;
 	uint32_t connector;
 
-	struct {
-		uint32_t dpms;
-	} props;
+	union wlr_drm_connector_props props;
 
 	uint32_t width;
 	uint32_t height;

From 67b51f092249a5b98fdaba651dabdf8c2a708c5e Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 29 Jul 2017 22:14:29 +1200
Subject: [PATCH 04/16] Upgraded CRTC and Encoder matching

---
 backend/drm/drm.c | 260 ++++++++++++++++++++++++++++++++++++++++------
 backend/drm/drm.h |   5 +-
 2 files changed, 232 insertions(+), 33 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index ca63a46a..b3bee244 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -348,17 +348,155 @@ static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable)
 	}
 }
 
+static inline bool is_taken(size_t n, const uint32_t arr[static n], uint32_t key)
+{
+	for (size_t i = 0; i < n; ++i) {
+		if (arr[i] == key) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/*
+ * Store all of the non-recursive state in a struct, so we aren't literally
+ * passing 12 arguments to a function.
+ */
+struct match_state {
+	const size_t num_objs;
+	const uint32_t *restrict objs;
+	const size_t num_res;
+	size_t score;
+	size_t replaced;
+	uint32_t *restrict res;
+	uint32_t *restrict best;
+	const uint32_t *restrict orig;
+	bool exit_early;
+};
+
+#define UNMATCHED (uint32_t)-1
+
+/*
+ * score: The number of resources we've matched so far.
+ * replaced: The number of changes from the original solution.
+ * i: The index of the current element.
+ *
+ * This tries to match a solution as close to st->orig as it can.
+ *
+ * Returns whether we've set a new best element with this solution.
+ */
+static bool match_obj_(struct match_state *st, size_t score, size_t replaced, size_t i) {
+	// Finished
+	if (i >= st->num_res) {
+		if (score > st->score || (score == st->score && replaced < st->replaced)) {
+			st->score = score;
+			st->replaced = replaced;
+			memcpy(st->best, st->res, sizeof st->best[0] * st->num_res);
+
+			if (st->score == st->num_objs && st->replaced == 0) {
+				st->exit_early = true;
+			}
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/*
+	 * Attempt to use the current solution first, to try and avoid
+	 * recalculating everything
+	 */
+
+	if (st->orig[i] != UNMATCHED && !is_taken(i, st->res, st->orig[i])) {
+		st->res[i] = st->orig[i];
+		if (match_obj_(st, score + 1, replaced, i + 1)) {
+			return true;
+		}
+	}
+
+	if (st->orig[i] != UNMATCHED) {
+		++replaced;
+	}
+
+	bool is_best = false;
+	for (st->res[i] = 0; st->res[i] < st->num_objs; ++st->res[i]) {
+		// We tried this earlier
+		if (st->res[i] == st->orig[i]) {
+			continue;
+		}
+
+		// Not compatable
+		if (!(st->objs[st->res[i]] & (1 << i))) {
+			continue;
+		}
+
+		// Already taken
+		if (is_taken(i, st->res, st->res[i])) {
+			continue;
+		}
+
+		if (match_obj_(st, score + 1, replaced, i + 1)) {
+			is_best = true;
+		}
+
+		if (st->exit_early) {
+			return true;
+		}
+	}
+
+	if (is_best) {
+		return true;
+	}
+
+	// Maybe this resource can't be matched
+	st->res[i] = UNMATCHED;
+	return match_obj_(st, score, replaced, i + 1);
+}
+
+/*
+ * Tries to match some DRM objects with some other DRM resource.
+ * e.g. Match CRTCs with Encoders, CRTCs with Planes.
+ *
+ * objs contains a bit array which resources it can be matched with.
+ * e.g. Bit 0 set means can be matched with res[0]
+ *
+ * res contains an index of which objs it is matched with or UNMATCHED.
+ *
+ * This solution is left in out.
+ */
+static size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
+		size_t num_res, const uint32_t res[static restrict num_res],
+		uint32_t out[static restrict num_res]) {
+	uint32_t solution[num_res];
+
+	struct match_state st = {
+		.num_objs = num_objs,
+		.num_res = num_res,
+		.score = 0,
+		.replaced = SIZE_MAX,
+		.objs = objs,
+		.res = solution,
+		.best = out,
+		.orig = res,
+		.exit_early = false,
+	};
+
+	match_obj_(&st, 0, 0, 0);
+	return st.score;
+}
+
 static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 		struct wlr_output_mode *mode) {
-	struct wlr_backend_state *state =
-		wl_container_of(output->renderer, state, renderer);
+	struct wlr_backend_state *drm =
+		wl_container_of(output->renderer, drm, renderer);
 
 	wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", output->base->name,
 			mode->width, mode->height, mode->refresh);
 
-	drmModeConnector *conn = drmModeGetConnector(state->fd, output->connector);
+	drmModeConnector *conn = drmModeGetConnector(drm->fd, output->connector);
 	if (!conn) {
-		wlr_log(L_ERROR, "Failed to get DRM connector");
+		wlr_log_errno(L_ERROR, "Failed to get DRM connector");
 		goto error;
 	}
 
@@ -367,39 +505,80 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 		goto error;
 	}
 
-	drmModeRes *res = drmModeGetResources(state->fd);
-	if (!res) {
-		wlr_log(L_ERROR, "Failed to get DRM resources");
-		goto error;
-	}
+	{
+		size_t index;
+		uint32_t crtc[drm->num_crtcs];
+		uint32_t possible_crtc[drm->outputs->length];
+		memset(possible_crtc, 0, sizeof(possible_crtc));
 
-	bool success = false;
-	for (int i = 0; !success && i < conn->count_encoders; ++i) {
-		drmModeEncoder *enc = drmModeGetEncoder(state->fd, conn->encoders[i]);
-		if (!enc) {
-			continue;
+		for (size_t i = 0; i < drm->num_crtcs; ++i) {
+			crtc[i] = UNMATCHED;
 		}
 
-		for (int j = 0; j < res->count_crtcs; ++j) {
-			if ((enc->possible_crtcs & (1 << j)) == 0) {
+		for (size_t i = 0; i < drm->outputs->length; ++i) {
+			struct wlr_output_state *o = drm->outputs->items[i];
+			if (o == output) {
+				index = i;
+			}
+
+			if (o->state != WLR_DRM_OUTPUT_CONNECTED) {
 				continue;
 			}
 
-			if ((state->taken_crtcs & (1 << j)) == 0) {
-				state->taken_crtcs |= 1 << j;
-				output->crtc = res->crtcs[j];
-				success = true;
-				break;
-			}
+			possible_crtc[i] = o->possible_crtc;
+			crtc[o->crtc_ - drm->crtcs] = i;
 		}
-		drmModeFreeEncoder(enc);
-	}
 
-	drmModeFreeResources(res);
+		for (int i = 0; i < conn->count_encoders; ++i) {
+			drmModeEncoder *enc = drmModeGetEncoder(drm->fd, conn->encoders[i]);
+			if (!enc) {
+				continue;
+			}
 
-	if (!success) {
-		wlr_log(L_ERROR, "Failed to find CRTC for %s", output->base->name);
-		goto error;
+			uint32_t res[drm->num_crtcs];
+
+			possible_crtc[index] = enc->possible_crtcs;
+			match_obj(drm->outputs->length, possible_crtc, drm->num_crtcs, crtc, res);
+
+			wlr_log(L_DEBUG, "-----");
+			for (size_t i = 0; i < drm->num_crtcs; ++i) {
+				wlr_log(L_DEBUG, "%d", (int)res[i]);
+			}
+			wlr_log(L_DEBUG, "-----");
+
+			bool handled[drm->outputs->length];
+			memset(handled, 0, sizeof(handled));
+
+			for (size_t i = 0; i < drm->num_crtcs; ++i) {
+				if (res[i] == UNMATCHED) {
+					continue;
+				}
+
+				handled[res[i]] = true;
+
+				if (res[i] != crtc[i]) {
+					struct wlr_output_state *o = drm->outputs->items[res[i]];
+					o->crtc_ = &drm->crtcs[i];
+					o->crtc = o->crtc_->id;
+				}
+			}
+
+			for (size_t i = 0; i < drm->num_crtcs; ++i) {
+				if (!handled[i]) {
+					wlr_drm_output_cleanup(drm->outputs->items[i], false);
+				}
+			}
+
+			if (!output->crtc_) {
+				wlr_log(L_ERROR, "Unable to match %s with a CRTC", output->base->name);
+				goto error;
+			}
+
+			output->possible_crtc = enc->possible_crtcs;
+
+			drmModeFreeEncoder(enc);
+			break;
+		}
 	}
 
 	output->state = WLR_DRM_OUTPUT_CONNECTED;
@@ -408,7 +587,7 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	output->base->current_mode = mode;
 	wl_signal_emit(&output->base->events.resolution, output->base);
 
-	if (!display_init_renderer(&state->renderer, output)) {
+	if (!display_init_renderer(&drm->renderer, output)) {
 		wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->base->name);
 		goto error;
 	}
@@ -522,12 +701,17 @@ static int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
 	int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
 		mode->vtotal / 2) / mode->vtotal;
 
-	if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+	if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
 		refresh *= 2;
-	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+	}
+
+	if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
 		refresh /= 2;
-	if (mode->vscan > 1)
+	}
+
+	if (mode->vscan > 1) {
 		refresh /= mode->vscan;
+	}
 
 	return refresh;
 }
@@ -793,10 +977,22 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 			restore_output(output, renderer->fd);
 			restore = false;
 		}
+
+		if (output->bo[0]) {
+			gbm_surface_release_buffer(output->gbm, output->bo[0]);
+			output->bo[0] = NULL;
+		}
+		if (output->bo[1]) {
+			gbm_surface_release_buffer(output->gbm, output->bo[1]);
+			output->bo[1] = NULL;
+		}
+
 		eglDestroySurface(renderer->egl.display, output->egl);
 		gbm_surface_destroy(output->gbm);
 		output->egl = EGL_NO_SURFACE;
 		output->gbm = NULL;
+		output->crtc_ = NULL;
+		output->possible_crtc = 0;
 		/* Fallthrough */
 	case WLR_DRM_OUTPUT_NEEDS_MODESET:
 		output->state = WLR_DRM_OUTPUT_DISCONNECTED;
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index 2f79417a..299be942 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -42,7 +42,7 @@ struct wlr_drm_crtc {
 	struct wlr_drm_plane *primary;
 	struct wlr_drm_plane *overlay;
 	struct wlr_drm_plane *cursor;
-	
+
 	union wlr_drm_crtc_props props;
 
 	struct wl_list connectors;
@@ -115,6 +115,9 @@ struct wlr_output_state {
 	enum wlr_drm_output_state state;
 	uint32_t connector;
 
+	struct wlr_drm_crtc *crtc_;
+	uint32_t possible_crtc;
+
 	union wlr_drm_connector_props props;
 
 	uint32_t width;

From e16c5504cd5debadf1349c0da296aaab225c0e38 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Mon, 31 Jul 2017 10:04:34 +1200
Subject: [PATCH 05/16] Add planes.

---
 backend/drm/drm.c | 227 ++++++++++++++++++++++++++++------------------
 backend/drm/drm.h |  34 +++++--
 2 files changed, 165 insertions(+), 96 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index b3bee244..09db530b 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -374,9 +374,13 @@ struct match_state {
 	bool exit_early;
 };
 
-#define UNMATCHED (uint32_t)-1
+enum {
+	UNMATCHED = (uint32_t)-1,
+	SKIP = (uint32_t)-2,
+};
 
 /*
+ * skips: The number of SKIP elements encountered so far.
  * score: The number of resources we've matched so far.
  * replaced: The number of changes from the original solution.
  * i: The index of the current element.
@@ -385,7 +389,7 @@ struct match_state {
  *
  * Returns whether we've set a new best element with this solution.
  */
-static bool match_obj_(struct match_state *st, size_t score, size_t replaced, size_t i) {
+static bool match_obj_(struct match_state *st, size_t skips, size_t score, size_t replaced, size_t i) {
 	// Finished
 	if (i >= st->num_res) {
 		if (score > st->score || (score == st->score && replaced < st->replaced)) {
@@ -396,6 +400,9 @@ static bool match_obj_(struct match_state *st, size_t score, size_t replaced, si
 			if (st->score == st->num_objs && st->replaced == 0) {
 				st->exit_early = true;
 			}
+			st->exit_early = (st->score == st->num_res - skips
+					|| st->score == st->num_objs)
+					&& st->replaced == 0;
 
 			return true;
 		} else {
@@ -403,6 +410,11 @@ static bool match_obj_(struct match_state *st, size_t score, size_t replaced, si
 		}
 	}
 
+	if (st->orig[i] == SKIP) {
+		st->res[i] = SKIP;
+		return match_obj_(st, skips + 1, score, replaced, i + 1);
+	}
+
 	/*
 	 * Attempt to use the current solution first, to try and avoid
 	 * recalculating everything
@@ -410,7 +422,7 @@ static bool match_obj_(struct match_state *st, size_t score, size_t replaced, si
 
 	if (st->orig[i] != UNMATCHED && !is_taken(i, st->res, st->orig[i])) {
 		st->res[i] = st->orig[i];
-		if (match_obj_(st, score + 1, replaced, i + 1)) {
+		if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
 			return true;
 		}
 	}
@@ -436,7 +448,7 @@ static bool match_obj_(struct match_state *st, size_t score, size_t replaced, si
 			continue;
 		}
 
-		if (match_obj_(st, score + 1, replaced, i + 1)) {
+		if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
 			is_best = true;
 		}
 
@@ -451,7 +463,7 @@ static bool match_obj_(struct match_state *st, size_t score, size_t replaced, si
 
 	// Maybe this resource can't be matched
 	st->res[i] = UNMATCHED;
-	return match_obj_(st, score, replaced, i + 1);
+	return match_obj_(st, skips, score, replaced, i + 1);
 }
 
 /*
@@ -464,6 +476,7 @@ static bool match_obj_(struct match_state *st, size_t score, size_t replaced, si
  * res contains an index of which objs it is matched with or UNMATCHED.
  *
  * This solution is left in out.
+ * Returns the total number of matched solutions.
  */
 static size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
 		size_t num_res, const uint32_t res[static restrict num_res],
@@ -482,14 +495,101 @@ static size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num
 		.exit_early = false,
 	};
 
-	match_obj_(&st, 0, 0, 0);
+	match_obj_(&st, 0, 0, 0, 0);
 	return st.score;
 }
 
+static void realloc_planes(struct wlr_backend_state *drm, const uint32_t *crtc_in) {
+	for (int i = 0; i < 3; ++i) {
+		if (drm->num_type_planes[i] == 0)
+			continue;
+
+		uint32_t possible[drm->num_type_planes[i]];
+		uint32_t crtc[drm->num_crtcs];
+		uint32_t crtc_res[drm->num_crtcs];
+
+		for (size_t j = 0; j < drm->num_type_planes[i]; ++j)
+			possible[j] = drm->type_planes[i][j].possible_crtcs;
+
+		for (size_t j = 0; j < drm->num_crtcs; ++j) {
+			if (crtc_in[j] == UNMATCHED) {
+				crtc[j] = SKIP;
+				continue;
+			}
+
+			if (drm->crtcs[j].planes[j]) {
+				crtc[j] = drm->crtcs[j].planes[i] - drm->type_planes[i];
+			} else {
+				crtc[j] = UNMATCHED;
+			}
+		}
+
+		match_obj(drm->num_type_planes[i], possible, drm->num_crtcs, crtc, crtc_res);
+
+		for (size_t j = 0; j < drm->num_crtcs; ++j) {
+			struct wlr_drm_crtc *c = &drm->crtcs[j];
+			c->planes[i] = &drm->type_planes[i][crtc_res[j]];
+		}
+	};
+}
+
+static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state *output) {
+	bool handled[drm->outputs->length];
+	uint32_t crtc[drm->num_crtcs];
+	uint32_t crtc_res[drm->num_crtcs];
+	uint32_t possible_crtc[drm->outputs->length];
+
+	for (size_t i = 0; i < drm->num_crtcs; ++i) {
+		crtc[i] = UNMATCHED;
+	}
+
+	memset(possible_crtc, 0, sizeof(possible_crtc));
+	memset(handled, 0, sizeof(handled));
+
+	size_t index;
+	for (size_t i = 0; i < drm->outputs->length; ++i) {
+		struct wlr_output_state *o = drm->outputs->items[i];
+		if (o == output) {
+			index = i;
+		}
+
+		if (o->state != WLR_DRM_OUTPUT_CONNECTED) {
+			continue;
+		}
+
+		possible_crtc[i] = o->possible_crtc;
+		crtc[o->crtc_ - drm->crtcs] = i;
+	}
+
+	possible_crtc[index] = output->possible_crtc;
+	match_obj(drm->outputs->length, possible_crtc, drm->num_crtcs, crtc, crtc_res);
+
+	realloc_planes(drm, crtc_res);
+
+	for (size_t i = 0; i < drm->num_crtcs; ++i) {
+		if (crtc_res[i] == UNMATCHED) {
+			continue;
+		}
+
+		handled[crtc_res[i]] = true;
+
+		if (crtc_res[i] != crtc[i]) {
+			struct wlr_output_state *o = drm->outputs->items[crtc_res[i]];
+			o->crtc_ = &drm->crtcs[i];
+			o->crtc = o->crtc_->id;
+		}
+	}
+
+	for (size_t i = 0; i < drm->outputs->length; ++i) {
+		if (!handled[i]) {
+			wlr_drm_output_cleanup(drm->outputs->items[i], false);
+		}
+	}
+}
+
 static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 		struct wlr_output_mode *mode) {
-	struct wlr_backend_state *drm =
-		wl_container_of(output->renderer, drm, renderer);
+	struct wlr_backend_state *drm = wl_container_of(output->renderer, drm, renderer);
 
 	wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", output->base->name,
 			mode->width, mode->height, mode->refresh);
@@ -497,90 +597,39 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	drmModeConnector *conn = drmModeGetConnector(drm->fd, output->connector);
 	if (!conn) {
 		wlr_log_errno(L_ERROR, "Failed to get DRM connector");
-		goto error;
+		goto error_output;
 	}
 
 	if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) {
 		wlr_log(L_ERROR, "%s is not connected", output->base->name);
-		goto error;
+		goto error_output;
 	}
 
-	{
-		size_t index;
-		uint32_t crtc[drm->num_crtcs];
-		uint32_t possible_crtc[drm->outputs->length];
-		memset(possible_crtc, 0, sizeof(possible_crtc));
-
-		for (size_t i = 0; i < drm->num_crtcs; ++i) {
-			crtc[i] = UNMATCHED;
-		}
-
-		for (size_t i = 0; i < drm->outputs->length; ++i) {
-			struct wlr_output_state *o = drm->outputs->items[i];
-			if (o == output) {
-				index = i;
-			}
-
-			if (o->state != WLR_DRM_OUTPUT_CONNECTED) {
-				continue;
-			}
-
-			possible_crtc[i] = o->possible_crtc;
-			crtc[o->crtc_ - drm->crtcs] = i;
-		}
-
-		for (int i = 0; i < conn->count_encoders; ++i) {
-			drmModeEncoder *enc = drmModeGetEncoder(drm->fd, conn->encoders[i]);
-			if (!enc) {
-				continue;
-			}
-
-			uint32_t res[drm->num_crtcs];
-
-			possible_crtc[index] = enc->possible_crtcs;
-			match_obj(drm->outputs->length, possible_crtc, drm->num_crtcs, crtc, res);
-
-			wlr_log(L_DEBUG, "-----");
-			for (size_t i = 0; i < drm->num_crtcs; ++i) {
-				wlr_log(L_DEBUG, "%d", (int)res[i]);
-			}
-			wlr_log(L_DEBUG, "-----");
-
-			bool handled[drm->outputs->length];
-			memset(handled, 0, sizeof(handled));
-
-			for (size_t i = 0; i < drm->num_crtcs; ++i) {
-				if (res[i] == UNMATCHED) {
-					continue;
-				}
-
-				handled[res[i]] = true;
-
-				if (res[i] != crtc[i]) {
-					struct wlr_output_state *o = drm->outputs->items[res[i]];
-					o->crtc_ = &drm->crtcs[i];
-					o->crtc = o->crtc_->id;
-				}
-			}
-
-			for (size_t i = 0; i < drm->num_crtcs; ++i) {
-				if (!handled[i]) {
-					wlr_drm_output_cleanup(drm->outputs->items[i], false);
-				}
-			}
-
-			if (!output->crtc_) {
-				wlr_log(L_ERROR, "Unable to match %s with a CRTC", output->base->name);
-				goto error;
-			}
-
-			output->possible_crtc = enc->possible_crtcs;
-
-			drmModeFreeEncoder(enc);
-			break;
-		}
+	drmModeEncoder *enc = NULL;
+	for (int i = 0; !enc && i < conn->count_encoders; ++i) {
+		enc = drmModeGetEncoder(drm->fd, conn->encoders[i]);
 	}
 
+	if (!enc) {
+		wlr_log(L_ERROR, "Failed to get DRM encoder");
+		goto error_conn;
+	}
+
+	output->possible_crtc = enc->possible_crtcs;
+	realloc_crtcs(drm, output);
+
+	if (!output->crtc_) {
+		wlr_log(L_ERROR, "Unable to match %s with a CRTC", output->base->name);
+		goto error_enc;
+	}
+
+	struct wlr_drm_crtc *crtc = output->crtc_;
+	wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", output->base->name,
+		crtc - drm->crtcs,
+		crtc->overlay ? crtc->overlay - drm->overlay_planes : -1,
+		crtc->primary ? crtc->primary - drm->primary_planes : -1,
+		crtc->cursor ? crtc->cursor - drm->cursor_planes : -1);
+
 	output->state = WLR_DRM_OUTPUT_CONNECTED;
 	output->width = output->base->width = mode->width;
 	output->height = output->base->height = mode->height;
@@ -589,15 +638,19 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 
 	if (!display_init_renderer(&drm->renderer, output)) {
 		wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->base->name);
-		goto error;
+		goto error_enc;
 	}
 
+	drmModeFreeEncoder(enc);
 	drmModeFreeConnector(conn);
 	return true;
 
-error:
-	wlr_drm_output_cleanup(output, false);
+error_enc:
+	drmModeFreeEncoder(enc);
+error_conn:
 	drmModeFreeConnector(conn);
+error_output:
+	wlr_drm_output_cleanup(output, false);
 	return false;
 }
 
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index 299be942..44eca101 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -39,9 +39,14 @@ struct wlr_drm_plane {
 
 struct wlr_drm_crtc {
 	uint32_t id;
-	struct wlr_drm_plane *primary;
-	struct wlr_drm_plane *overlay;
-	struct wlr_drm_plane *cursor;
+	union {
+		struct {
+			struct wlr_drm_plane *overlay;
+			struct wlr_drm_plane *primary;
+			struct wlr_drm_plane *cursor;
+		};
+		struct wlr_drm_plane *planes[3];
+	};
 
 	union wlr_drm_crtc_props props;
 
@@ -78,12 +83,23 @@ struct wlr_backend_state {
 	size_t num_planes;
 	struct wlr_drm_plane *planes;
 
-	size_t num_overlay_planes;
-	struct wlr_drm_plane *overlay_planes;
-	size_t num_primary_planes;
-	struct wlr_drm_plane *primary_planes;
-	size_t num_cursor_planes;
-	struct wlr_drm_plane *cursor_planes;
+	union {
+		struct {
+			size_t num_overlay_planes;
+			size_t num_primary_planes;
+			size_t num_cursor_planes;
+		};
+		size_t num_type_planes[3];
+	};
+
+	union {
+		struct {
+			struct wlr_drm_plane *overlay_planes;
+			struct wlr_drm_plane *primary_planes;
+			struct wlr_drm_plane *cursor_planes;
+		};
+		struct wlr_drm_plane *type_planes[3];
+	};
 
 	struct wl_display *display;
 	struct wl_event_source *drm_event;

From c46605d605a0dd859ffff5d196dcc29371ac7a3f Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 5 Aug 2017 17:27:59 +1200
Subject: [PATCH 06/16] Use plane for rendering

---
 backend/drm/drm-properties.c |   2 +-
 backend/drm/drm.c            | 183 ++++++++++++++++++-----------------
 backend/drm/drm.h            |   5 +-
 3 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/backend/drm/drm-properties.c b/backend/drm/drm-properties.c
index 9310ffdd..391ae38c 100644
--- a/backend/drm/drm-properties.c
+++ b/backend/drm/drm-properties.c
@@ -27,7 +27,7 @@ static const struct prop_info connector_info[] = {
 
 static const struct prop_info crtc_info[] = {
 #define INDEX(name) (offsetof(union wlr_drm_crtc_props, name) / sizeof(uint32_t))
-	{ "rotation",  INDEX(rotation) },
+	{ "rotation",     INDEX(rotation) },
 	{ "scaling mode", INDEX(scaling_mode) },
 #undef INDEX
 };
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 09db530b..c0cd89af 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -196,13 +196,14 @@ static void free_fb(struct gbm_bo *bo, void *data) {
 	uint32_t *id = data;
 
 	if (id && *id) {
-		drmModeRmFB(gbm_bo_get_fd(bo), *id);
+		struct gbm_device *gbm = gbm_bo_get_device(bo);
+		drmModeRmFB(gbm_device_get_fd(gbm), *id);
 	}
 
 	free(id);
 }
 
-static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) {
+static uint32_t get_fb_for_bo(struct gbm_bo *bo) {
 	uint32_t *id = gbm_bo_get_user_data(bo);
 
 	if (id) {
@@ -215,6 +216,9 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) {
 		return 0;
 	}
 
+	struct gbm_device *gbm = gbm_bo_get_device(bo);
+	int fd = gbm_device_get_fd(gbm);
+
 	drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32,
 		     gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id);
 
@@ -225,26 +229,32 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo) {
 
 static void wlr_drm_output_make_current(struct wlr_output_state *output) {
 	struct wlr_drm_renderer *renderer = output->renderer;
-	eglMakeCurrent(renderer->egl.display, output->egl,
-			output->egl, renderer->egl.context);
+	struct wlr_drm_plane *plane = output->crtc->primary;
+
+	eglMakeCurrent(renderer->egl.display, plane->egl,
+			plane->egl, renderer->egl.context);
 }
 
 static void wlr_drm_output_swap_buffers(struct wlr_output_state *output) {
 	struct wlr_drm_renderer *renderer = output->renderer;
+	struct wlr_drm_crtc *crtc = output->crtc;
+	struct wlr_drm_plane *plane = crtc->primary;
 
-	if (!eglSwapBuffers(renderer->egl.display, output->egl)) {
+	if (!eglSwapBuffers(renderer->egl.display, plane->egl)) {
 		return;
 	}
-	struct gbm_bo *bo = gbm_surface_lock_front_buffer(output->gbm);
+
+	struct gbm_bo *bo = gbm_surface_lock_front_buffer(plane->gbm);
 	if (!bo) {
 		return;
 	}
-	uint32_t fb_id = get_fb_for_bo(renderer->fd, bo);
-	drmModePageFlip(renderer->fd, output->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
+
+	uint32_t fb_id = get_fb_for_bo(bo);
+	drmModePageFlip(renderer->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
 	output->pageflip_pending = true;
 
-	output->bo[1] = output->bo[0];
-	output->bo[0] = bo;
+	plane->front = plane->back;
+	plane->back = bo;
 }
 
 void wlr_drm_output_pause_renderer(struct wlr_output_state *output) {
@@ -252,14 +262,17 @@ void wlr_drm_output_pause_renderer(struct wlr_output_state *output) {
 		return;
 	}
 
-	if (output->bo[1]) {
-		gbm_surface_release_buffer(output->gbm, output->bo[1]);
-		output->bo[1] = NULL;
+	struct wlr_drm_plane *plane = output->crtc->primary;
+
+	if (plane->front) {
+		gbm_surface_release_buffer(plane->gbm, plane->front);
+		plane->front = NULL;
 	}
-	if (output->bo[0]) {
-		gbm_surface_release_buffer(output->gbm, output->bo[0]);
-		output->bo[0] = NULL;
+	if (plane->back) {
+		gbm_surface_release_buffer(plane->gbm, plane->back);
+		plane->back = NULL;
 	}
+
 }
 
 void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
@@ -269,47 +282,52 @@ void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
 
 	struct wlr_drm_renderer *renderer = output->renderer;
 	struct wlr_output_mode *mode = output->base->current_mode;
+	struct wlr_drm_crtc *crtc = output->crtc;
+	struct wlr_drm_plane *plane = crtc->primary;
 
-	// Render black frame
-	eglMakeCurrent(renderer->egl.display, output->egl, output->egl, renderer->egl.context);
+	eglMakeCurrent(renderer->egl.display, plane->egl, plane->egl, renderer->egl.context);
 
 	glViewport(0, 0, output->width, output->height);
 	glClearColor(0.0, 0.0, 0.0, 1.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 
-	eglSwapBuffers(renderer->egl.display, output->egl);
+	if (!eglSwapBuffers(renderer->egl.display, plane->egl)) {
+		return;
+	}
 
-	struct gbm_bo *bo = gbm_surface_lock_front_buffer(output->gbm);
-	uint32_t fb_id = get_fb_for_bo(renderer->fd, bo);
+	struct gbm_bo *bo = gbm_surface_lock_front_buffer(plane->gbm);
+	if (!bo) {
+		return;
+	}
 
-	drmModeSetCrtc(renderer->fd, output->crtc, fb_id, 0, 0,
-			&output->connector, 1, &mode->state->mode);
-	drmModePageFlip(renderer->fd, output->crtc, fb_id,
-			DRM_MODE_PAGE_FLIP_EVENT, output);
+	uint32_t fb_id = get_fb_for_bo(bo);
+	drmModeSetCrtc(renderer->fd, crtc->id, fb_id, 0, 0,
+		&output->connector, 1, &mode->state->mode);
+	drmModePageFlip(renderer->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
+	output->pageflip_pending = true;
 
-	output->bo[1] = NULL;
-	output->bo[0] = bo;
+	plane->back = plane->front;
+	plane->front = bo;
 }
 
-static bool display_init_renderer(struct wlr_drm_renderer *renderer,
-	struct wlr_output_state *output) {
-	struct wlr_output_mode *mode = output->base->current_mode;
-	output->renderer = renderer;
-	output->gbm = gbm_surface_create(renderer->gbm, mode->width,
+static bool plane_init_renderer(struct wlr_drm_renderer *renderer,
+		struct wlr_drm_plane *plane, struct wlr_output_mode *mode) {
+	plane->width = mode->width;
+	plane->height = mode->height;
+
+	plane->gbm = gbm_surface_create(renderer->gbm, mode->width,
 		mode->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
-	if (!output->gbm) {
-		wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", output->base->name,
-			strerror(errno));
+	if (!plane->gbm) {
+		wlr_log_errno(L_ERROR, "Failed to create GBM surface for plane");
 		return false;
 	}
 
-	output->egl = wlr_egl_create_surface(&renderer->egl, output->gbm);
-	if (output->egl == EGL_NO_SURFACE) {
-		wlr_log(L_ERROR, "Failed to create EGL surface for %s", output->base->name);
+	plane->egl = wlr_egl_create_surface(&renderer->egl, plane->gbm);
+	if (plane->egl == EGL_NO_SURFACE) {
+		wlr_log(L_ERROR, "Failed to create EGL surface for plane");
 		return false;
 	}
 
-	wlr_drm_output_start_renderer(output);
 	return true;
 }
 
@@ -500,37 +518,37 @@ static size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num
 }
 
 static void realloc_planes(struct wlr_backend_state *drm, const uint32_t *crtc_in) {
-	for (int i = 0; i < 3; ++i) {
-		if (drm->num_type_planes[i] == 0)
+	// overlay, primary, cursor
+	for (int type = 0; type < 3; ++type) {
+		if (drm->num_type_planes[type] == 0)
 			continue;
 
-		uint32_t possible[drm->num_type_planes[i]];
+		uint32_t possible[drm->num_type_planes[type]];
 		uint32_t crtc[drm->num_crtcs];
 		uint32_t crtc_res[drm->num_crtcs];
 
-		for (size_t j = 0; j < drm->num_type_planes[i]; ++j)
-			possible[j] = drm->type_planes[i][j].possible_crtcs;
+		for (size_t i = 0; i < drm->num_type_planes[type]; ++i)
+			possible[i] = drm->type_planes[type][i].possible_crtcs;
 
-		for (size_t j = 0; j < drm->num_crtcs; ++j) {
-			if (crtc_in[j] == UNMATCHED) {
-				crtc[j] = SKIP;
+		for (size_t i = 0; i < drm->num_crtcs; ++i) {
+			if (crtc_in[i] == UNMATCHED)
+				crtc[i] = SKIP;
+			else if (drm->crtcs[i].planes[type])
+				crtc[i] = drm->crtcs[i].planes[type] - drm->type_planes[type];
+			else
+				crtc[i] = UNMATCHED;
+		}
+
+		match_obj(drm->num_type_planes[type], possible, drm->num_crtcs, crtc, crtc_res);
+
+		for (size_t i = 0; i < drm->num_crtcs; ++i) {
+			if (crtc_res[i] == UNMATCHED || crtc_res[i] == SKIP)
 				continue;
-			}
 
-			if (drm->crtcs[j].planes[j]) {
-				crtc[j] = drm->crtcs[j].planes[i] - drm->type_planes[i];
-			} else {
-				crtc[j] = UNMATCHED;
-			}
+			struct wlr_drm_crtc *c = &drm->crtcs[i];
+			c->planes[type] = &drm->type_planes[type][crtc_res[i]];
 		}
-
-		match_obj(drm->num_type_planes[i], possible, drm->num_crtcs, crtc, crtc_res);
-
-		for (size_t j = 0; j < drm->num_crtcs; ++j) {
-			struct wlr_drm_crtc *c = &drm->crtcs[j];
-			c->planes[i] = &drm->type_planes[i][crtc_res[j]];
-		}
-	};
+	}
 }
 
 static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state *output) {
@@ -558,7 +576,7 @@ static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state
 		}
 
 		possible_crtc[i] = o->possible_crtc;
-		crtc[o->crtc_ - drm->crtcs] = i;
+		crtc[o->crtc - drm->crtcs] = i;
 	}
 
 	possible_crtc[index] = output->possible_crtc;
@@ -575,8 +593,7 @@ static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state
 
 		if (crtc_res[i] != crtc[i]) {
 			struct wlr_output_state *o = drm->outputs->items[crtc_res[i]];
-			o->crtc_ = &drm->crtcs[i];
-			o->crtc = o->crtc_->id;
+			o->crtc = &drm->crtcs[i];
 		}
 	}
 
@@ -618,12 +635,12 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	output->possible_crtc = enc->possible_crtcs;
 	realloc_crtcs(drm, output);
 
-	if (!output->crtc_) {
+	if (!output->crtc) {
 		wlr_log(L_ERROR, "Unable to match %s with a CRTC", output->base->name);
 		goto error_enc;
 	}
 
-	struct wlr_drm_crtc *crtc = output->crtc_;
+	struct wlr_drm_crtc *crtc = output->crtc;
 	wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", output->base->name,
 		crtc - drm->crtcs,
 		crtc->overlay ? crtc->overlay - drm->overlay_planes : -1,
@@ -636,11 +653,13 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	output->base->current_mode = mode;
 	wl_signal_emit(&output->base->events.resolution, output->base);
 
-	if (!display_init_renderer(&drm->renderer, output)) {
-		wlr_log(L_ERROR, "Failed to initalise renderer for %s", output->base->name);
+	if (!plane_init_renderer(&drm->renderer, output->crtc->primary, mode)) {
+		wlr_log(L_ERROR, "Failed to initalise renderer for plane");
 		goto error_enc;
 	}
 
+	wlr_drm_output_start_renderer(output);
+
 	drmModeFreeEncoder(enc);
 	drmModeFreeConnector(conn);
 	return true;
@@ -663,7 +682,7 @@ static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
 		const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height) {
 	struct wlr_backend_state *state = wl_container_of(output->renderer, state, renderer);
 	if (!buf) {
-		drmModeSetCursor(state->fd, output->crtc, 0, 0, 0);
+		drmModeSetCursor(state->fd, output->crtc->id, 0, 0, 0);
 		return true;
 	}
 
@@ -719,7 +738,7 @@ static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
 	}
 
 	uint32_t bo_handle = gbm_bo_get_handle(bo).u32;
-	if (drmModeSetCursor(state->fd, output->crtc, bo_handle, bo_width, bo_height)) {
+	if (drmModeSetCursor(state->fd, output->crtc->id, bo_handle, bo_width, bo_height)) {
 		wlr_log_errno(L_INFO, "Failed to set hardware cursor");
 		return false;
 	}
@@ -731,7 +750,7 @@ static bool wlr_drm_output_move_cursor(struct wlr_output_state *output,
 		int x, int y) {
 	struct wlr_backend_state *state =
 		wl_container_of(output->renderer, state, renderer);
-	return !drmModeMoveCursor(state->fd, output->crtc, x, y);
+	return !drmModeMoveCursor(state->fd, output->crtc->id, x, y);
 }
 
 static void wlr_drm_output_destroy(struct wlr_output_state *output) {
@@ -978,9 +997,10 @@ static void page_flip_handler(int fd, unsigned seq,
 	struct wlr_backend_state *state =
 		wl_container_of(output->renderer, state, renderer);
 
-	if (output->gbm && output->bo[1]) {
-		gbm_surface_release_buffer(output->gbm, output->bo[1]);
-		output->bo[1] = NULL;
+	struct wlr_drm_plane *plane = output->crtc->primary;
+	if (plane->front) {
+		gbm_surface_release_buffer(plane->gbm, plane->front);
+		plane->front = NULL;
 	}
 
 	output->pageflip_pending = false;
@@ -1031,20 +1051,7 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 			restore = false;
 		}
 
-		if (output->bo[0]) {
-			gbm_surface_release_buffer(output->gbm, output->bo[0]);
-			output->bo[0] = NULL;
-		}
-		if (output->bo[1]) {
-			gbm_surface_release_buffer(output->gbm, output->bo[1]);
-			output->bo[1] = NULL;
-		}
-
-		eglDestroySurface(renderer->egl.display, output->egl);
-		gbm_surface_destroy(output->gbm);
-		output->egl = EGL_NO_SURFACE;
-		output->gbm = NULL;
-		output->crtc_ = NULL;
+		output->crtc = NULL;
 		output->possible_crtc = 0;
 		/* Fallthrough */
 	case WLR_DRM_OUTPUT_NEEDS_MODESET:
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index 44eca101..921ad78a 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -131,7 +131,7 @@ struct wlr_output_state {
 	enum wlr_drm_output_state state;
 	uint32_t connector;
 
-	struct wlr_drm_crtc *crtc_;
+	struct wlr_drm_crtc *crtc;
 	uint32_t possible_crtc;
 
 	union wlr_drm_connector_props props;
@@ -139,12 +139,9 @@ struct wlr_output_state {
 	uint32_t width;
 	uint32_t height;
 
-	uint32_t crtc;
 	drmModeCrtc *old_crtc;
 
 	struct wlr_drm_renderer *renderer;
-	EGLSurface *egl;
-	struct gbm_surface *gbm;
 	struct gbm_bo *bo[2];
 	struct gbm_bo *cursor_bo[2];
 	int current_cursor;

From d1ca1ec16ea29457a6964984f2fe4c808015fe6f Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 5 Aug 2017 17:56:22 +1200
Subject: [PATCH 07/16] Split off some functions into drm-util

---
 backend/drm/drm-util.c | 267 ++++++++++++++++++++++++++++++++++++++
 backend/drm/drm-util.h |  37 ++++++
 backend/drm/drm.c      | 282 +----------------------------------------
 backend/meson.build    |   2 +
 4 files changed, 309 insertions(+), 279 deletions(-)
 create mode 100644 backend/drm/drm-util.c
 create mode 100644 backend/drm/drm-util.h

diff --git a/backend/drm/drm-util.c b/backend/drm/drm-util.c
new file mode 100644
index 00000000..68f35fe0
--- /dev/null
+++ b/backend/drm/drm-util.c
@@ -0,0 +1,267 @@
+#include <stdio.h>
+#include <string.h>
+#include <drm.h>
+#include <drm_mode.h>
+#include "drm-util.h"
+
+int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
+	int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
+		mode->vtotal / 2) / mode->vtotal;
+
+	if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
+		refresh *= 2;
+	}
+
+	if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
+		refresh /= 2;
+	}
+
+	if (mode->vscan > 1) {
+		refresh /= mode->vscan;
+	}
+
+	return refresh;
+}
+
+// Constructed from http://edid.tv/manufacturer
+static const char *get_manufacturer(uint16_t id) {
+#define ID(a, b, c) ((a & 0x1f) << 10) | ((b & 0x1f) << 5) | (c & 0x1f)
+	switch (id) {
+	case ID('A', 'A', 'A'): return "Avolites Ltd";
+	case ID('A', 'C', 'I'): return "Ancor Communications Inc";
+	case ID('A', 'C', 'R'): return "Acer Technologies";
+	case ID('A', 'P', 'P'): return "Apple Computer Inc";
+	case ID('B', 'N', 'O'): return "Bang & Olufsen";
+	case ID('C', 'M', 'N'): return "Chimei Innolux Corporation";
+	case ID('C', 'M', 'O'): return "Chi Mei Optoelectronics corp.";
+	case ID('C', 'R', 'O'): return "Extraordinary Technologies PTY Limited";
+	case ID('D', 'E', 'L'): return "Dell Inc.";
+	case ID('D', 'O', 'N'): return "DENON, Ltd.";
+	case ID('E', 'N', 'C'): return "Eizo Nanao Corporation";
+	case ID('E', 'P', 'H'): return "Epiphan Systems Inc.";
+	case ID('F', 'U', 'S'): return "Fujitsu Siemens Computers GmbH";
+	case ID('G', 'S', 'M'): return "Goldstar Company Ltd";
+	case ID('H', 'I', 'Q'): return "Kaohsiung Opto Electronics Americas, Inc.";
+	case ID('H', 'S', 'D'): return "HannStar Display Corp";
+	case ID('H', 'W', 'P'): return "Hewlett Packard";
+	case ID('I', 'N', 'T'): return "Interphase Corporation";
+	case ID('I', 'V', 'M'): return "Iiyama North America";
+	case ID('L', 'E', 'N'): return "Lenovo Group Limited";
+	case ID('M', 'A', 'X'): return "Rogen Tech Distribution Inc";
+	case ID('M', 'E', 'G'): return "Abeam Tech Ltd";
+	case ID('M', 'E', 'I'): return "Panasonic Industry Company";
+	case ID('M', 'T', 'C'): return "Mars-Tech Corporation";
+	case ID('M', 'T', 'X'): return "Matrox";
+	case ID('N', 'E', 'C'): return "NEC Corporation";
+	case ID('O', 'N', 'K'): return "ONKYO Corporation";
+	case ID('O', 'R', 'N'): return "ORION ELECTRIC CO., LTD.";
+	case ID('O', 'T', 'M'): return "Optoma Corporation";
+	case ID('O', 'V', 'R'): return "Oculus VR, Inc.";
+	case ID('P', 'H', 'L'): return "Philips Consumer Electronics Company";
+	case ID('P', 'I', 'O'): return "Pioneer Electronic Corporation";
+	case ID('P', 'N', 'R'): return "Planar Systems, Inc.";
+	case ID('Q', 'D', 'S'): return "Quanta Display Inc.";
+	case ID('S', 'A', 'M'): return "Samsung Electric Company";
+	case ID('S', 'E', 'C'): return "Seiko Epson Corporation";
+	case ID('S', 'H', 'P'): return "Sharp Corporation";
+	case ID('S', 'I', 'I'): return "Silicon Image, Inc.";
+	case ID('S', 'N', 'Y'): return "Sony";
+	case ID('T', 'O', 'P'): return "Orion Communications Co., Ltd.";
+	case ID('T', 'S', 'B'): return "Toshiba America Info Systems Inc";
+	case ID('T', 'S', 'T'): return "Transtream Inc";
+	case ID('U', 'N', 'K'): return "Unknown";
+	case ID('V', 'I', 'Z'): return "VIZIO, Inc";
+	case ID('V', 'S', 'C'): return "ViewSonic Corporation";
+	case ID('Y', 'M', 'H'): return "Yamaha Corporation";
+	default:                return "Unknown";
+	}
+#undef ID
+}
+
+/* See https://en.wikipedia.org/wiki/Extended_Display_Identification_Data for layout of EDID data.
+ * We don't parse the EDID properly. We just expect to receive valid data.
+ */
+void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data) {
+	if (!data || len < 128) {
+		snprintf(output->make, sizeof(output->make), "<Unknown>");
+		snprintf(output->model, sizeof(output->model), "<Unknown>");
+		return;
+	}
+
+	uint16_t id = (data[8] << 8) | data[9];
+	snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id));
+
+	output->phys_width = ((data[68] & 0xf0) << 4) | data[66];
+	output->phys_height = ((data[68] & 0x0f) << 8) | data[67];
+
+	for (size_t i = 72; i <= 108; i += 18) {
+		uint16_t flag = (data[i] << 8) | data[i + 1];
+		if (flag == 0 && data[i + 3] == 0xFC) {
+			sprintf(output->model, "%.13s", &data[i + 5]);
+
+			// Monitor names are terminated by newline if they're too short
+			char *nl = strchr(output->model, '\n');
+			if (nl) {
+				*nl = '\0';
+			}
+
+			break;
+		}
+	}
+}
+
+const char *conn_get_name(uint32_t type_id) {
+	switch (type_id) {
+	case DRM_MODE_CONNECTOR_Unknown:     return "Unknown";
+	case DRM_MODE_CONNECTOR_VGA:         return "VGA";
+	case DRM_MODE_CONNECTOR_DVII:        return "DVI-I";
+	case DRM_MODE_CONNECTOR_DVID:        return "DVI-D";
+	case DRM_MODE_CONNECTOR_DVIA:        return "DVI-A";
+	case DRM_MODE_CONNECTOR_Composite:   return "Composite";
+	case DRM_MODE_CONNECTOR_SVIDEO:      return "SVIDEO";
+	case DRM_MODE_CONNECTOR_LVDS:        return "LVDS";
+	case DRM_MODE_CONNECTOR_Component:   return "Component";
+	case DRM_MODE_CONNECTOR_9PinDIN:     return "DIN";
+	case DRM_MODE_CONNECTOR_DisplayPort: return "DP";
+	case DRM_MODE_CONNECTOR_HDMIA:       return "HDMI-A";
+	case DRM_MODE_CONNECTOR_HDMIB:       return "HDMI-B";
+	case DRM_MODE_CONNECTOR_TV:          return "TV";
+	case DRM_MODE_CONNECTOR_eDP:         return "eDP";
+	case DRM_MODE_CONNECTOR_VIRTUAL:     return "Virtual";
+	case DRM_MODE_CONNECTOR_DSI:         return "DSI";
+	default:                             return "Unknown";
+	}
+}
+
+static inline bool is_taken(size_t n, const uint32_t arr[static n], uint32_t key) {
+	for (size_t i = 0; i < n; ++i) {
+		if (arr[i] == key) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/*
+ * Store all of the non-recursive state in a struct, so we aren't literally
+ * passing 12 arguments to a function.
+ */
+struct match_state {
+	const size_t num_objs;
+	const uint32_t *restrict objs;
+	const size_t num_res;
+	size_t score;
+	size_t replaced;
+	uint32_t *restrict res;
+	uint32_t *restrict best;
+	const uint32_t *restrict orig;
+	bool exit_early;
+};
+
+/*
+ * skips: The number of SKIP elements encountered so far.
+ * score: The number of resources we've matched so far.
+ * replaced: The number of changes from the original solution.
+ * i: The index of the current element.
+ *
+ * This tries to match a solution as close to st->orig as it can.
+ *
+ * Returns whether we've set a new best element with this solution.
+ */
+static bool match_obj_(struct match_state *st, size_t skips, size_t score, size_t replaced, size_t i) {
+	// Finished
+	if (i >= st->num_res) {
+		if (score > st->score || (score == st->score && replaced < st->replaced)) {
+			st->score = score;
+			st->replaced = replaced;
+			memcpy(st->best, st->res, sizeof st->best[0] * st->num_res);
+
+			if (st->score == st->num_objs && st->replaced == 0) {
+				st->exit_early = true;
+			}
+			st->exit_early = (st->score == st->num_res - skips
+					|| st->score == st->num_objs)
+					&& st->replaced == 0;
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	if (st->orig[i] == SKIP) {
+		st->res[i] = SKIP;
+		return match_obj_(st, skips + 1, score, replaced, i + 1);
+	}
+
+	/*
+	 * Attempt to use the current solution first, to try and avoid
+	 * recalculating everything
+	 */
+
+	if (st->orig[i] != UNMATCHED && !is_taken(i, st->res, st->orig[i])) {
+		st->res[i] = st->orig[i];
+		if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
+			return true;
+		}
+	}
+
+	if (st->orig[i] != UNMATCHED) {
+		++replaced;
+	}
+
+	bool is_best = false;
+	for (st->res[i] = 0; st->res[i] < st->num_objs; ++st->res[i]) {
+		// We tried this earlier
+		if (st->res[i] == st->orig[i]) {
+			continue;
+		}
+
+		// Not compatable
+		if (!(st->objs[st->res[i]] & (1 << i))) {
+			continue;
+		}
+
+		// Already taken
+		if (is_taken(i, st->res, st->res[i])) {
+			continue;
+		}
+
+		if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
+			is_best = true;
+		}
+
+		if (st->exit_early) {
+			return true;
+		}
+	}
+
+	if (is_best) {
+		return true;
+	}
+
+	// Maybe this resource can't be matched
+	st->res[i] = UNMATCHED;
+	return match_obj_(st, skips, score, replaced, i + 1);
+}
+
+size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
+		size_t num_res, const uint32_t res[static restrict num_res],
+		uint32_t out[static restrict num_res]) {
+	uint32_t solution[num_res];
+
+	struct match_state st = {
+		.num_objs = num_objs,
+		.num_res = num_res,
+		.score = 0,
+		.replaced = SIZE_MAX,
+		.objs = objs,
+		.res = solution,
+		.best = out,
+		.orig = res,
+		.exit_early = false,
+	};
+
+	match_obj_(&st, 0, 0, 0, 0);
+	return st.score;
+}
diff --git a/backend/drm/drm-util.h b/backend/drm/drm-util.h
new file mode 100644
index 00000000..759bdb48
--- /dev/null
+++ b/backend/drm/drm-util.h
@@ -0,0 +1,37 @@
+#ifndef WLR_DRM_UTIL_H
+#define WLR_DRM_UTIL_H
+
+#include <stdint.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <wlr/types/wlr_output.h>
+
+// Calculates a more accurate refresh rate (mHz) than what mode itself provides
+int32_t calculate_refresh_rate(drmModeModeInfo *mode);
+// Populates the make/model/phys_{width,height} of output from the edid data
+void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data);
+// Returns the string representation of a DRM output type
+const char *conn_get_name(uint32_t type_id);
+
+// Part of match_obj
+enum {
+	UNMATCHED = (uint32_t)-1,
+	SKIP = (uint32_t)-2,
+};
+
+/*
+ * Tries to match some DRM objects with some other DRM resource.
+ * e.g. Match CRTCs with Encoders, CRTCs with Planes.
+ *
+ * objs contains a bit array which resources it can be matched with.
+ * e.g. Bit 0 set means can be matched with res[0]
+ *
+ * res contains an index of which objs it is matched with or UNMATCHED.
+ *
+ * This solution is left in out.
+ * Returns the total number of matched solutions.
+ */
+size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
+		size_t num_res, const uint32_t res[static restrict num_res],
+		uint32_t out[static restrict num_res]);
+#endif
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index c0cd89af..d617473c 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -16,26 +16,7 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
 #include "drm.h"
-
-static const char *conn_name[] = {
-	[DRM_MODE_CONNECTOR_Unknown]     = "Unknown",
-	[DRM_MODE_CONNECTOR_VGA]         = "VGA",
-	[DRM_MODE_CONNECTOR_DVII]        = "DVI-I",
-	[DRM_MODE_CONNECTOR_DVID]        = "DVI-D",
-	[DRM_MODE_CONNECTOR_DVIA]        = "DVI-A",
-	[DRM_MODE_CONNECTOR_Composite]   = "Composite",
-	[DRM_MODE_CONNECTOR_SVIDEO]      = "SVIDEO",
-	[DRM_MODE_CONNECTOR_LVDS]        = "LVDS",
-	[DRM_MODE_CONNECTOR_Component]   = "Component",
-	[DRM_MODE_CONNECTOR_9PinDIN]     = "DIN",
-	[DRM_MODE_CONNECTOR_DisplayPort] = "DP",
-	[DRM_MODE_CONNECTOR_HDMIA]       = "HDMI-A",
-	[DRM_MODE_CONNECTOR_HDMIB]       = "HDMI-B",
-	[DRM_MODE_CONNECTOR_TV]          = "TV",
-	[DRM_MODE_CONNECTOR_eDP]         = "eDP",
-	[DRM_MODE_CONNECTOR_VIRTUAL]     = "Virtual",
-	[DRM_MODE_CONNECTOR_DSI]         = "DSI",
-};
+#include "drm-util.h"
 
 static int cmp_plane(const void *arg1, const void *arg2)
 {
@@ -362,161 +343,10 @@ static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable)
 		wlr_drm_output_swap_buffers(output);
 	} else {
 		drmModeConnectorSetProperty(state->fd, output->connector, output->props.dpms,
-			DRM_MODE_DPMS_STANDBY);
+			DRM_MODE_DPMS_OFF);
 	}
 }
 
-static inline bool is_taken(size_t n, const uint32_t arr[static n], uint32_t key)
-{
-	for (size_t i = 0; i < n; ++i) {
-		if (arr[i] == key) {
-			return true;
-		}
-	}
-	return false;
-}
-
-/*
- * Store all of the non-recursive state in a struct, so we aren't literally
- * passing 12 arguments to a function.
- */
-struct match_state {
-	const size_t num_objs;
-	const uint32_t *restrict objs;
-	const size_t num_res;
-	size_t score;
-	size_t replaced;
-	uint32_t *restrict res;
-	uint32_t *restrict best;
-	const uint32_t *restrict orig;
-	bool exit_early;
-};
-
-enum {
-	UNMATCHED = (uint32_t)-1,
-	SKIP = (uint32_t)-2,
-};
-
-/*
- * skips: The number of SKIP elements encountered so far.
- * score: The number of resources we've matched so far.
- * replaced: The number of changes from the original solution.
- * i: The index of the current element.
- *
- * This tries to match a solution as close to st->orig as it can.
- *
- * Returns whether we've set a new best element with this solution.
- */
-static bool match_obj_(struct match_state *st, size_t skips, size_t score, size_t replaced, size_t i) {
-	// Finished
-	if (i >= st->num_res) {
-		if (score > st->score || (score == st->score && replaced < st->replaced)) {
-			st->score = score;
-			st->replaced = replaced;
-			memcpy(st->best, st->res, sizeof st->best[0] * st->num_res);
-
-			if (st->score == st->num_objs && st->replaced == 0) {
-				st->exit_early = true;
-			}
-			st->exit_early = (st->score == st->num_res - skips
-					|| st->score == st->num_objs)
-					&& st->replaced == 0;
-
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	if (st->orig[i] == SKIP) {
-		st->res[i] = SKIP;
-		return match_obj_(st, skips + 1, score, replaced, i + 1);
-	}
-
-	/*
-	 * Attempt to use the current solution first, to try and avoid
-	 * recalculating everything
-	 */
-
-	if (st->orig[i] != UNMATCHED && !is_taken(i, st->res, st->orig[i])) {
-		st->res[i] = st->orig[i];
-		if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
-			return true;
-		}
-	}
-
-	if (st->orig[i] != UNMATCHED) {
-		++replaced;
-	}
-
-	bool is_best = false;
-	for (st->res[i] = 0; st->res[i] < st->num_objs; ++st->res[i]) {
-		// We tried this earlier
-		if (st->res[i] == st->orig[i]) {
-			continue;
-		}
-
-		// Not compatable
-		if (!(st->objs[st->res[i]] & (1 << i))) {
-			continue;
-		}
-
-		// Already taken
-		if (is_taken(i, st->res, st->res[i])) {
-			continue;
-		}
-
-		if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
-			is_best = true;
-		}
-
-		if (st->exit_early) {
-			return true;
-		}
-	}
-
-	if (is_best) {
-		return true;
-	}
-
-	// Maybe this resource can't be matched
-	st->res[i] = UNMATCHED;
-	return match_obj_(st, skips, score, replaced, i + 1);
-}
-
-/*
- * Tries to match some DRM objects with some other DRM resource.
- * e.g. Match CRTCs with Encoders, CRTCs with Planes.
- *
- * objs contains a bit array which resources it can be matched with.
- * e.g. Bit 0 set means can be matched with res[0]
- *
- * res contains an index of which objs it is matched with or UNMATCHED.
- *
- * This solution is left in out.
- * Returns the total number of matched solutions.
- */
-static size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
-		size_t num_res, const uint32_t res[static restrict num_res],
-		uint32_t out[static restrict num_res]) {
-	uint32_t solution[num_res];
-
-	struct match_state st = {
-		.num_objs = num_objs,
-		.num_res = num_res,
-		.score = 0,
-		.replaced = SIZE_MAX,
-		.objs = objs,
-		.res = solution,
-		.best = out,
-		.orig = res,
-		.exit_early = false,
-	};
-
-	match_obj_(&st, 0, 0, 0, 0);
-	return st.score;
-}
-
 static void realloc_planes(struct wlr_backend_state *drm, const uint32_t *crtc_in) {
 	// overlay, primary, cursor
 	for (int type = 0; type < 3; ++type) {
@@ -769,112 +599,6 @@ static struct wlr_output_impl output_impl = {
 	.swap_buffers = wlr_drm_output_swap_buffers,
 };
 
-static int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
-	int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
-		mode->vtotal / 2) / mode->vtotal;
-
-	if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
-		refresh *= 2;
-	}
-
-	if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
-		refresh /= 2;
-	}
-
-	if (mode->vscan > 1) {
-		refresh /= mode->vscan;
-	}
-
-	return refresh;
-}
-
-// Constructed from http://edid.tv/manufacturer
-static const char *get_manufacturer(uint16_t id) {
-#define ID(a, b, c) ((a & 0x1f) << 10) | ((b & 0x1f) << 5) | (c & 0x1f)
-	switch (id) {
-	case ID('A', 'A', 'A'): return "Avolites Ltd";
-	case ID('A', 'C', 'I'): return "Ancor Communications Inc";
-	case ID('A', 'C', 'R'): return "Acer Technologies";
-	case ID('A', 'P', 'P'): return "Apple Computer Inc";
-	case ID('B', 'N', 'O'): return "Bang & Olufsen";
-	case ID('C', 'M', 'N'): return "Chimei Innolux Corporation";
-	case ID('C', 'M', 'O'): return "Chi Mei Optoelectronics corp.";
-	case ID('C', 'R', 'O'): return "Extraordinary Technologies PTY Limited";
-	case ID('D', 'E', 'L'): return "Dell Inc.";
-	case ID('D', 'O', 'N'): return "DENON, Ltd.";
-	case ID('E', 'N', 'C'): return "Eizo Nanao Corporation";
-	case ID('E', 'P', 'H'): return "Epiphan Systems Inc.";
-	case ID('F', 'U', 'S'): return "Fujitsu Siemens Computers GmbH";
-	case ID('G', 'S', 'M'): return "Goldstar Company Ltd";
-	case ID('H', 'I', 'Q'): return "Kaohsiung Opto Electronics Americas, Inc.";
-	case ID('H', 'S', 'D'): return "HannStar Display Corp";
-	case ID('H', 'W', 'P'): return "Hewlett Packard";
-	case ID('I', 'N', 'T'): return "Interphase Corporation";
-	case ID('I', 'V', 'M'): return "Iiyama North America";
-	case ID('L', 'E', 'N'): return "Lenovo Group Limited";
-	case ID('M', 'A', 'X'): return "Rogen Tech Distribution Inc";
-	case ID('M', 'E', 'G'): return "Abeam Tech Ltd";
-	case ID('M', 'E', 'I'): return "Panasonic Industry Company";
-	case ID('M', 'T', 'C'): return "Mars-Tech Corporation";
-	case ID('M', 'T', 'X'): return "Matrox";
-	case ID('N', 'E', 'C'): return "NEC Corporation";
-	case ID('O', 'N', 'K'): return "ONKYO Corporation";
-	case ID('O', 'R', 'N'): return "ORION ELECTRIC CO., LTD.";
-	case ID('O', 'T', 'M'): return "Optoma Corporation";
-	case ID('O', 'V', 'R'): return "Oculus VR, Inc.";
-	case ID('P', 'H', 'L'): return "Philips Consumer Electronics Company";
-	case ID('P', 'I', 'O'): return "Pioneer Electronic Corporation";
-	case ID('P', 'N', 'R'): return "Planar Systems, Inc.";
-	case ID('Q', 'D', 'S'): return "Quanta Display Inc.";
-	case ID('S', 'A', 'M'): return "Samsung Electric Company";
-	case ID('S', 'E', 'C'): return "Seiko Epson Corporation";
-	case ID('S', 'H', 'P'): return "Sharp Corporation";
-	case ID('S', 'I', 'I'): return "Silicon Image, Inc.";
-	case ID('S', 'N', 'Y'): return "Sony";
-	case ID('T', 'O', 'P'): return "Orion Communications Co., Ltd.";
-	case ID('T', 'S', 'B'): return "Toshiba America Info Systems Inc";
-	case ID('T', 'S', 'T'): return "Transtream Inc";
-	case ID('U', 'N', 'K'): return "Unknown";
-	case ID('V', 'I', 'Z'): return "VIZIO, Inc";
-	case ID('V', 'S', 'C'): return "ViewSonic Corporation";
-	case ID('Y', 'M', 'H'): return "Yamaha Corporation";
-	default: return "Unknown";
-	}
-#undef ID
-}
-
-/* See https://en.wikipedia.org/wiki/Extended_Display_Identification_Data for layout of EDID data.
- * We don't parse the EDID properly. We just expect to receive valid data.
- */
-static void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data) {
-	if (!data || len < 128) {
-		snprintf(output->make, sizeof(output->make), "<Unknown>");
-		snprintf(output->model, sizeof(output->model), "<Unknown>");
-		return;
-	}
-
-	uint16_t id = (data[8] << 8) | data[9];
-	snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id));
-
-	output->phys_width = ((data[68] & 0xf0) << 4) | data[66];
-	output->phys_height = ((data[68] & 0x0f) << 8) | data[67];
-
-	for (size_t i = 72; i <= 108; i += 18) {
-		uint16_t flag = (data[i] << 8) | data[i + 1];
-		if (flag == 0 && data[i + 3] == 0xFC) {
-			sprintf(output->model, "%.13s", &data[i + 5]);
-
-			// Monitor names are terminated by newline if they're too short
-			char *nl = strchr(output->model, '\n');
-			if (nl) {
-				*nl = '\0';
-			}
-
-			break;
-		}
-	}
-}
-
 static const int32_t subpixel_map[] = {
 	[DRM_MODE_SUBPIXEL_UNKNOWN] = WL_OUTPUT_SUBPIXEL_UNKNOWN,
 	[DRM_MODE_SUBPIXEL_HORIZONTAL_RGB] = WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB,
@@ -934,7 +658,7 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *drm) {
 			output->base->phys_height = conn->mmHeight;
 			output->base->subpixel = subpixel_map[conn->subpixel];
 			snprintf(output->base->name, sizeof(output->base->name), "%s-%"PRIu32,
-				 conn_name[conn->connector_type],
+				 conn_get_name(conn->connector_type),
 				 conn->connector_type_id);
 
 			wlr_drm_get_connector_props(drm->fd, output->connector, &output->props);
diff --git a/backend/meson.build b/backend/meson.build
index dc5a3d66..a5bf5058 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -7,6 +7,8 @@ wlr_files += files(
     'session/session.c',
     'drm/backend.c',
     'drm/drm.c',
+    'drm/drm-properties.c',
+    'drm/drm-util.c',
     'libinput/backend.c',
     'libinput/events.c',
     'libinput/keyboard.c',

From dd7a3492958d2e97de185abf2539b78131cab548 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 5 Aug 2017 18:15:39 +1200
Subject: [PATCH 08/16] Various cleanups

---
 backend/drm/backend.c | 93 +++++++++++++++++++++----------------------
 backend/drm/drm.c     | 15 ++++++-
 backend/drm/drm.h     |  3 +-
 3 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 6f5b0596..ea14d41c 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -15,24 +15,26 @@
 #include <backend/udev.h>
 #include "drm.h"
 
-static bool wlr_drm_backend_init(struct wlr_backend_state *state) {
-	wlr_drm_scan_connectors(state);
+static bool wlr_drm_backend_init(struct wlr_backend_state *drm) {
+	wlr_drm_scan_connectors(drm);
 	return true;
 }
 
-static void wlr_drm_backend_destroy(struct wlr_backend_state *state) {
-	if (!state) {
+static void wlr_drm_backend_destroy(struct wlr_backend_state *drm) {
+	if (!drm) {
 		return;
 	}
-	for (size_t i = 0; state->outputs && i < state->outputs->length; ++i) {
-		struct wlr_output_state *output = state->outputs->items[i];
+
+	for (size_t i = 0; drm->outputs && i < drm->outputs->length; ++i) {
+		struct wlr_output_state *output = drm->outputs->items[i];
 		wlr_output_destroy(output->base);
 	}
-	wlr_udev_signal_remove(state->udev, &state->drm_invalidated);
-	wlr_drm_renderer_free(&state->renderer);
-	wlr_session_close_file(state->session, state->fd);
-	wl_event_source_remove(state->drm_event);
-	free(state);
+
+	wlr_udev_signal_remove(drm->udev, &drm->drm_invalidated);
+	wlr_drm_renderer_free(&drm->renderer);
+	wlr_session_close_file(drm->session, drm->fd);
+	wl_event_source_remove(drm->drm_event);
+	free(drm);
 }
 
 static struct wlr_backend_impl backend_impl = {
@@ -76,73 +78,68 @@ static void drm_invalidated(struct wl_listener *listener, void *data) {
 
 struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 		struct wlr_session *session, struct wlr_udev *udev, int gpu_fd) {
-	assert(display && session && gpu_fd > 0);
+	assert(display && session && gpu_fd >= 0);
 
 	char *name = drmGetDeviceNameFromFd2(gpu_fd);
 	drmVersion *version = drmGetVersion(gpu_fd);
-
 	wlr_log(L_INFO, "Initalizing DRM backend for %s (%s)", name, version->name);
-
 	free(name);
 	drmFreeVersion(version);
 
-	struct wlr_backend_state *state = calloc(1, sizeof(struct wlr_backend_state));
-	if (!state) {
-		wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
+	struct wlr_backend_state *drm = calloc(1, sizeof(*drm));
+	if (!drm) {
+		wlr_log_errno(L_ERROR, "Allocation failed");
 		return NULL;
 	}
 
-	struct wlr_backend *backend = wlr_backend_create(&backend_impl, state);
+	struct wlr_backend *backend = wlr_backend_create(&backend_impl, drm);
 	if (!backend) {
-		wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
+		wlr_log_errno(L_ERROR, "Allocation failed");
 		return NULL;
 	}
 
-	state->base = backend;
-	state->session = session;
-	state->udev = udev;
-	state->outputs = list_create();
-	if (!state->outputs) {
+	drm->base = backend;
+	drm->session = session;
+	drm->udev = udev;
+	drm->outputs = list_create();
+	if (!drm->outputs) {
 		wlr_log(L_ERROR, "Failed to allocate list");
 		goto error_backend;
 	}
 
-	state->fd = gpu_fd;
+	drm->fd = gpu_fd;
 
 	struct stat st;
-	if (fstat(state->fd, &st) < 0) {
-		wlr_log(L_ERROR, "Stat failed: %s", strerror(errno));
+	if (fstat(drm->fd, &st) < 0) {
+		wlr_log_errno(L_ERROR, "Stat failed");
 	}
-	state->dev = st.st_rdev;
+	drm->dev = st.st_rdev;
 
-	state->drm_invalidated.notify = drm_invalidated;
-	wlr_udev_signal_add(udev, state->dev, &state->drm_invalidated);
+	drm->drm_invalidated.notify = drm_invalidated;
+	wlr_udev_signal_add(udev, drm->dev, &drm->drm_invalidated);
 
-	state->display = display;
+	drm->display = display;
 	struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
 
-	state->drm_event = wl_event_loop_add_fd(event_loop, state->fd,
+	drm->drm_event = wl_event_loop_add_fd(event_loop, drm->fd,
 		WL_EVENT_READABLE, wlr_drm_event, NULL);
-	if (!state->drm_event) {
+	if (!drm->drm_event) {
 		wlr_log(L_ERROR, "Failed to create DRM event source");
 		goto error_fd;
 	}
 
-	state->session_signal.notify = session_signal;
-	wl_signal_add(&session->session_signal, &state->session_signal);
+	drm->session_signal.notify = session_signal;
+	wl_signal_add(&session->session_signal, &drm->session_signal);
 
-	if (drmSetClientCap(state->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
-		wlr_log(L_INFO, "DRM universal planes unsupported");
-	}
-	if (drmSetClientCap(state->fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
-		wlr_log(L_INFO, "Atomic modesetting unsupported");
+	if (!wlr_drm_check_features(drm)) {
+		goto error_event;
 	}
 
-	wlr_drm_init_resources(state);
+	if (!wlr_drm_resources_init(drm)) {
+		goto error_event;
+	}
 
-	// TODO: what is the difference between the per-output renderer and this
-	// one?
-	if (!wlr_drm_renderer_init(&state->renderer, state->fd)) {
+	if (!wlr_drm_renderer_init(&drm->renderer, drm->fd)) {
 		wlr_log(L_ERROR, "Failed to initialize renderer");
 		goto error_event;
 	}
@@ -150,12 +147,12 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 	return backend;
 
 error_event:
-	wl_event_source_remove(state->drm_event);
+	wl_event_source_remove(drm->drm_event);
 error_fd:
-	wlr_session_close_file(state->session, state->fd);
-	list_free(state->outputs);
+	wlr_session_close_file(drm->session, drm->fd);
+	list_free(drm->outputs);
 error_backend:
-	free(state);
+	free(drm);
 	free(backend);
 	return NULL;
 }
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index d617473c..d2a4f06b 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -18,6 +18,19 @@
 #include "drm.h"
 #include "drm-util.h"
 
+bool wlr_drm_check_features(struct wlr_backend_state *drm) {
+	if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
+		wlr_log(L_INFO, "DRM universal planes unsupported");
+		return false;
+	}
+
+	if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
+		wlr_log(L_INFO, "Atomic modesetting unsupported");
+	}
+
+	return true;
+}
+
 static int cmp_plane(const void *arg1, const void *arg2)
 {
 	const struct wlr_drm_plane *a = arg1;
@@ -112,7 +125,7 @@ error_res:
 	return false;
 }
 
-bool wlr_drm_init_resources(struct wlr_backend_state *drm) {
+bool wlr_drm_resources_init(struct wlr_backend_state *drm) {
 	drmModeRes *res = drmModeGetResources(drm->fd);
 	if (!res) {
 		wlr_log_errno(L_ERROR, "Failed to get DRM resources");
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index 921ad78a..ed431680 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -151,7 +151,8 @@ struct wlr_output_state {
 	bool cleanup;
 };
 
-bool wlr_drm_init_resources(struct wlr_backend_state *drm);
+bool wlr_drm_check_features(struct wlr_backend_state *drm);
+bool wlr_drm_resources_init(struct wlr_backend_state *drm);
 void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore);
 
 void wlr_drm_scan_connectors(struct wlr_backend_state *state);

From 2f8b5c4448a5df9eda773ece10f4e20195679eaa Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 5 Aug 2017 19:49:34 +1200
Subject: [PATCH 09/16] More cleanups

---
 backend/drm/backend.c |   6 +-
 backend/drm/drm.c     | 166 +++++++++++++++---------------------------
 backend/drm/drm.h     |   2 +-
 examples/shared.c     |   2 +-
 4 files changed, 63 insertions(+), 113 deletions(-)

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index ea14d41c..dde34003 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -32,6 +32,7 @@ static void wlr_drm_backend_destroy(struct wlr_backend_state *drm) {
 
 	wlr_udev_signal_remove(drm->udev, &drm->drm_invalidated);
 	wlr_drm_renderer_free(&drm->renderer);
+	wlr_drm_resources_free(drm);
 	wlr_session_close_file(drm->session, drm->fd);
 	wl_event_source_remove(drm->drm_event);
 	free(drm);
@@ -55,11 +56,6 @@ static void session_signal(struct wl_listener *listener, void *data) {
 		}
 	} else {
 		wlr_log(L_INFO, "DRM fd paused");
-
-		for (size_t i = 0; i < drm->outputs->length; ++i) {
-			struct wlr_output_state *output = drm->outputs->items[i];
-			wlr_drm_output_pause_renderer(output);
-		}
 	}
 }
 
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index d2a4f06b..8d52504e 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -54,19 +54,15 @@ static bool init_planes(struct wlr_backend_state *drm)
 		return true;
 	}
 
-	size_t num_planes = plane_res->count_planes;
-	struct wlr_drm_plane *planes = calloc(num_planes, sizeof(*planes));
-	if (!planes) {
+	drm->num_planes = plane_res->count_planes;
+	drm->planes = calloc(drm->num_planes, sizeof(*drm->planes));
+	if (!drm->planes) {
 		wlr_log_errno(L_ERROR, "Allocation failed");
 		goto error_res;
 	}
 
-	size_t num_overlay = 0;
-	size_t num_primary = 0;
-	size_t num_cursor = 0;
-
-	for (size_t i = 0; i < num_planes; ++i) {
-		struct wlr_drm_plane *p = &planes[i];
+	for (size_t i = 0; i < drm->num_planes; ++i) {
+		struct wlr_drm_plane *p = &drm->planes[i];
 
 		drmModePlane *plane = drmModeGetPlane(drm->fd, plane_res->planes[i]);
 		if (!plane) {
@@ -85,41 +81,24 @@ static bool init_planes(struct wlr_backend_state *drm)
 		}
 
 		p->type = type;
-
-		switch (type) {
-		case DRM_PLANE_TYPE_OVERLAY:
-			++num_overlay;
-			break;
-		case DRM_PLANE_TYPE_PRIMARY:
-			++num_primary;
-			break;
-		case DRM_PLANE_TYPE_CURSOR:
-			++num_cursor;
-			break;
-		}
+		drm->num_type_planes[type]++;
 
 		drmModeFreePlane(plane);
 	}
 
 	wlr_log(L_INFO, "(%zu overlay, %zu primary, %zu cursor)",
-		num_overlay, num_primary, num_cursor);
+		drm->num_overlay_planes, drm->num_primary_planes, drm->num_cursor_planes);
 
-	qsort(planes, num_planes, sizeof(*planes), cmp_plane);
+	qsort(drm->planes, drm->num_planes, sizeof(*drm->planes), cmp_plane);
 
-	drm->num_planes = num_planes;
-	drm->num_overlay_planes = num_overlay;
-	drm->num_primary_planes = num_primary;
-	drm->num_cursor_planes = num_cursor;
-
-	drm->planes = planes;
-	drm->overlay_planes = planes;
-	drm->primary_planes = planes + num_overlay;
-	drm->cursor_planes = planes + num_overlay + num_primary;
+	drm->overlay_planes = drm->planes;
+	drm->primary_planes = drm->overlay_planes + drm->num_overlay_planes;
+	drm->cursor_planes = drm->primary_planes + drm->num_primary_planes;
 
 	return true;
 
 error_planes:
-	free(planes);
+	free(drm->planes);
 error_res:
 	drmModeFreePlaneResources(plane_res);
 	return false;
@@ -162,6 +141,14 @@ error_res:
 	return false;
 }
 
+void wlr_drm_resources_free(struct wlr_backend_state *drm) {
+	if (!drm)
+		return;
+
+	free(drm->crtcs);
+	free(drm->planes);
+}
+
 bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
 	renderer->gbm = gbm_create_device(fd);
 	if (!renderer->gbm) {
@@ -179,54 +166,55 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
 }
 
 void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) {
-	if (!renderer) {
+	if (!renderer)
 		return;
-	}
+
 	wlr_egl_free(&renderer->egl);
 	gbm_device_destroy(renderer->gbm);
 }
 
 static void free_fb(struct gbm_bo *bo, void *data) {
-	uint32_t *id = data;
+	uint32_t id = (uintptr_t)data;
 
-	if (id && *id) {
+	if (id) {
 		struct gbm_device *gbm = gbm_bo_get_device(bo);
-		drmModeRmFB(gbm_device_get_fd(gbm), *id);
+		drmModeRmFB(gbm_device_get_fd(gbm), id);
 	}
-
-	free(id);
 }
 
 static uint32_t get_fb_for_bo(struct gbm_bo *bo) {
-	uint32_t *id = gbm_bo_get_user_data(bo);
-
-	if (id) {
-		return *id;
-	}
-
-	id = calloc(1, sizeof *id);
-	if (!id) {
-		wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
-		return 0;
-	}
+	uint32_t id = (uintptr_t)gbm_bo_get_user_data(bo);
+	if (id)
+		return id;
 
 	struct gbm_device *gbm = gbm_bo_get_device(bo);
-	int fd = gbm_device_get_fd(gbm);
+	drmModeAddFB(gbm_device_get_fd(gbm), gbm_bo_get_width(bo), gbm_bo_get_height(bo),
+		24, 32, gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, &id);
 
-	drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32,
-		     gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id);
+	gbm_bo_set_user_data(bo, (void *)(uintptr_t)id, free_fb);
 
-	gbm_bo_set_user_data(bo, id, free_fb);
+	return id;
+}
 
-	return *id;
+static void wlr_drm_plane_make_current(struct wlr_drm_renderer *renderer,
+		struct wlr_drm_plane *plane) {
+	eglMakeCurrent(renderer->egl.display, plane->egl, plane->egl,
+		renderer->egl.context);
+}
+
+static void wlr_drm_plane_swap_buffers(struct wlr_drm_renderer *renderer,
+		struct wlr_drm_plane *plane) {
+	if (plane->front)
+		gbm_surface_release_buffer(plane->gbm, plane->front);
+
+	eglSwapBuffers(renderer->egl.display, plane->egl);
+
+	plane->front = plane->back;
+	plane->back = gbm_surface_lock_front_buffer(plane->gbm);
 }
 
 static void wlr_drm_output_make_current(struct wlr_output_state *output) {
-	struct wlr_drm_renderer *renderer = output->renderer;
-	struct wlr_drm_plane *plane = output->crtc->primary;
-
-	eglMakeCurrent(renderer->egl.display, plane->egl,
-			plane->egl, renderer->egl.context);
+	wlr_drm_plane_make_current(output->renderer, output->crtc->primary);
 }
 
 static void wlr_drm_output_swap_buffers(struct wlr_output_state *output) {
@@ -234,39 +222,11 @@ static void wlr_drm_output_swap_buffers(struct wlr_output_state *output) {
 	struct wlr_drm_crtc *crtc = output->crtc;
 	struct wlr_drm_plane *plane = crtc->primary;
 
-	if (!eglSwapBuffers(renderer->egl.display, plane->egl)) {
-		return;
-	}
+	wlr_drm_plane_swap_buffers(renderer, plane);
+	uint32_t fb_id = get_fb_for_bo(plane->back);
 
-	struct gbm_bo *bo = gbm_surface_lock_front_buffer(plane->gbm);
-	if (!bo) {
-		return;
-	}
-
-	uint32_t fb_id = get_fb_for_bo(bo);
 	drmModePageFlip(renderer->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
 	output->pageflip_pending = true;
-
-	plane->front = plane->back;
-	plane->back = bo;
-}
-
-void wlr_drm_output_pause_renderer(struct wlr_output_state *output) {
-	if (output->state != WLR_DRM_OUTPUT_CONNECTED) {
-		return;
-	}
-
-	struct wlr_drm_plane *plane = output->crtc->primary;
-
-	if (plane->front) {
-		gbm_surface_release_buffer(plane->gbm, plane->front);
-		plane->front = NULL;
-	}
-	if (plane->back) {
-		gbm_surface_release_buffer(plane->gbm, plane->back);
-		plane->back = NULL;
-	}
-
 }
 
 void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
@@ -279,19 +239,16 @@ void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
 	struct wlr_drm_crtc *crtc = output->crtc;
 	struct wlr_drm_plane *plane = crtc->primary;
 
-	eglMakeCurrent(renderer->egl.display, plane->egl, plane->egl, renderer->egl.context);
-
-	glViewport(0, 0, output->width, output->height);
-	glClearColor(0.0, 0.0, 0.0, 1.0);
-	glClear(GL_COLOR_BUFFER_BIT);
-
-	if (!eglSwapBuffers(renderer->egl.display, plane->egl)) {
-		return;
-	}
-
-	struct gbm_bo *bo = gbm_surface_lock_front_buffer(plane->gbm);
+	struct gbm_bo *bo = plane->front;
 	if (!bo) {
-		return;
+		// Render a black frame to start the rendering loop
+		wlr_drm_plane_make_current(renderer, plane);
+		glViewport(0, 0, plane->width, plane->height);
+		glClearColor(0.0, 0.0, 0.0, 1.0);
+		glClear(GL_COLOR_BUFFER_BIT);
+		wlr_drm_plane_swap_buffers(renderer, plane);
+
+		bo = plane->back;
 	}
 
 	uint32_t fb_id = get_fb_for_bo(bo);
@@ -299,9 +256,6 @@ void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
 		&output->connector, 1, &mode->state->mode);
 	drmModePageFlip(renderer->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output);
 	output->pageflip_pending = true;
-
-	plane->back = plane->front;
-	plane->front = bo;
 }
 
 static bool plane_init_renderer(struct wlr_drm_renderer *renderer,
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index ed431680..ec068cd0 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -153,12 +153,12 @@ struct wlr_output_state {
 
 bool wlr_drm_check_features(struct wlr_backend_state *drm);
 bool wlr_drm_resources_init(struct wlr_backend_state *drm);
+void wlr_drm_resources_free(struct wlr_backend_state *drm);
 void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore);
 
 void wlr_drm_scan_connectors(struct wlr_backend_state *state);
 int wlr_drm_event(int fd, uint32_t mask, void *data);
 
 void wlr_drm_output_start_renderer(struct wlr_output_state *output);
-void wlr_drm_output_pause_renderer(struct wlr_output_state *output);
 
 #endif
diff --git a/examples/shared.c b/examples/shared.c
index c66b8a23..cebdb785 100644
--- a/examples/shared.c
+++ b/examples/shared.c
@@ -9,7 +9,7 @@
 #include <wayland-server-protocol.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
-#include <wlr/backend/multi.h> 
+#include <wlr/backend/multi.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/util/log.h>

From aedfa27d3a213dd9cf53ed3351874b34ff0de119 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 5 Aug 2017 21:29:58 +1200
Subject: [PATCH 10/16] Clean up resources when plane is reassigned

---
 backend/drm/drm.c  | 170 +++++++++++++++++++++++++++++----------------
 backend/drm/drm.h  |   1 -
 types/wlr_output.c |   2 +-
 3 files changed, 110 insertions(+), 63 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 8d52504e..1cc52d35 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -173,6 +173,56 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) {
 	gbm_device_destroy(renderer->gbm);
 }
 
+static bool wlr_drm_plane_renderer_init(struct wlr_drm_renderer *renderer,
+		struct wlr_drm_plane *plane, uint32_t width, uint32_t height) {
+	if (plane->width == width && plane->height == height) {
+		return true;
+	}
+
+	plane->width = width;
+	plane->height = height;
+
+	plane->gbm = gbm_surface_create(renderer->gbm, width, height,
+		GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+	if (!plane->gbm) {
+		wlr_log_errno(L_ERROR, "Failed to create GBM surface for plane");
+		return false;
+	}
+
+	plane->egl = wlr_egl_create_surface(&renderer->egl, plane->gbm);
+	if (plane->egl == EGL_NO_SURFACE) {
+		wlr_log(L_ERROR, "Failed to create EGL surface for plane");
+		return false;
+	}
+
+	return true;
+}
+
+static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer,
+		struct wlr_drm_plane *plane) {
+	if (!renderer || !plane)
+		return;
+
+	wlr_log(L_DEBUG, "%s called", __func__);
+
+	if (plane->front)
+		gbm_surface_release_buffer(plane->gbm, plane->front);
+	if (plane->back)
+		gbm_surface_release_buffer(plane->gbm, plane->back);
+
+	if (plane->egl)
+		eglDestroySurface(renderer->egl.display, plane->egl);
+	if (plane->gbm)
+		gbm_surface_destroy(plane->gbm);
+
+	plane->width = 0;
+	plane->height = 0;
+	plane->egl = EGL_NO_SURFACE;
+	plane->gbm = NULL;
+	plane->front = NULL;
+	plane->back = NULL;
+}
+
 static void free_fb(struct gbm_bo *bo, void *data) {
 	uint32_t id = (uintptr_t)data;
 
@@ -258,40 +308,6 @@ void wlr_drm_output_start_renderer(struct wlr_output_state *output) {
 	output->pageflip_pending = true;
 }
 
-static bool plane_init_renderer(struct wlr_drm_renderer *renderer,
-		struct wlr_drm_plane *plane, struct wlr_output_mode *mode) {
-	plane->width = mode->width;
-	plane->height = mode->height;
-
-	plane->gbm = gbm_surface_create(renderer->gbm, mode->width,
-		mode->height, GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
-	if (!plane->gbm) {
-		wlr_log_errno(L_ERROR, "Failed to create GBM surface for plane");
-		return false;
-	}
-
-	plane->egl = wlr_egl_create_surface(&renderer->egl, plane->gbm);
-	if (plane->egl == EGL_NO_SURFACE) {
-		wlr_log(L_ERROR, "Failed to create EGL surface for plane");
-		return false;
-	}
-
-	return true;
-}
-
-static int find_id(const void *item, const void *cmp_to) {
-	const struct wlr_output_state *output = item;
-	const uint32_t *id = cmp_to;
-
-	if (output->connector < *id) {
-		return -1;
-	} else if (output->connector > *id) {
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
 static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable) {
 	struct wlr_backend_state *state =
 		wl_container_of(output->renderer, state, renderer);
@@ -303,11 +319,7 @@ static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable)
 		drmModeConnectorSetProperty(state->fd, output->connector, output->props.dpms,
 			DRM_MODE_DPMS_ON);
 
-		// Start rendering loop again by drawing a black frame
-		wlr_drm_output_make_current(output);
-		glClearColor(0.0, 0.0, 0.0, 1.0);
-		glClear(GL_COLOR_BUFFER_BIT);
-		wlr_drm_output_swap_buffers(output);
+		wlr_drm_output_start_renderer(output);
 	} else {
 		drmModeConnectorSetProperty(state->fd, output->connector, output->props.dpms,
 			DRM_MODE_DPMS_OFF);
@@ -343,13 +355,19 @@ static void realloc_planes(struct wlr_backend_state *drm, const uint32_t *crtc_i
 				continue;
 
 			struct wlr_drm_crtc *c = &drm->crtcs[i];
-			c->planes[type] = &drm->type_planes[type][crtc_res[i]];
+			struct wlr_drm_plane **old = &c->planes[type];
+			struct wlr_drm_plane *new = &drm->type_planes[type][crtc_res[i]];
+
+			if (*old != new) {
+				wlr_drm_plane_renderer_free(&drm->renderer, *old);
+				wlr_drm_plane_renderer_free(&drm->renderer, new);
+				*old = new;
+			}
 		}
 	}
 }
 
 static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state *output) {
-	bool handled[drm->outputs->length];
 	uint32_t crtc[drm->num_crtcs];
 	uint32_t crtc_res[drm->num_crtcs];
 	uint32_t possible_crtc[drm->outputs->length];
@@ -359,18 +377,15 @@ static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state
 	}
 
 	memset(possible_crtc, 0, sizeof(possible_crtc));
-	memset(handled, 0, sizeof(handled));
 
 	size_t index;
 	for (size_t i = 0; i < drm->outputs->length; ++i) {
 		struct wlr_output_state *o = drm->outputs->items[i];
-		if (o == output) {
+		if (o == output)
 			index = i;
-		}
 
-		if (o->state != WLR_DRM_OUTPUT_CONNECTED) {
+		if (o->state != WLR_DRM_OUTPUT_CONNECTED)
 			continue;
-		}
 
 		possible_crtc[i] = o->possible_crtc;
 		crtc[o->crtc - drm->crtcs] = i;
@@ -379,14 +394,22 @@ static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state
 	possible_crtc[index] = output->possible_crtc;
 	match_obj(drm->outputs->length, possible_crtc, drm->num_crtcs, crtc, crtc_res);
 
-	realloc_planes(drm, crtc_res);
+	bool matched = false;
+	for (size_t i = 0; i < drm->num_crtcs; ++i) {
+		// We don't want any of the current monitors to be deactivated.
+		if (crtc[i] != UNMATCHED && crtc_res[i] == UNMATCHED)
+			return;
+		if (crtc_res[i] == index)
+			matched = true;
+	}
+
+	// There is no point doing anything if this monitor doesn't get activated
+	if (!matched)
+		return;
 
 	for (size_t i = 0; i < drm->num_crtcs; ++i) {
-		if (crtc_res[i] == UNMATCHED) {
+		if (crtc_res[i] == UNMATCHED)
 			continue;
-		}
-
-		handled[crtc_res[i]] = true;
 
 		if (crtc_res[i] != crtc[i]) {
 			struct wlr_output_state *o = drm->outputs->items[crtc_res[i]];
@@ -394,11 +417,7 @@ static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state
 		}
 	}
 
-	for (size_t i = 0; i < drm->outputs->length; ++i) {
-		if (!handled[i]) {
-			wlr_drm_output_cleanup(drm->outputs->items[i], false);
-		}
-	}
+	realloc_planes(drm, crtc_res);
 }
 
 static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
@@ -450,12 +469,24 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 	output->base->current_mode = mode;
 	wl_signal_emit(&output->base->events.resolution, output->base);
 
-	if (!plane_init_renderer(&drm->renderer, output->crtc->primary, mode)) {
-		wlr_log(L_ERROR, "Failed to initalise renderer for plane");
-		goto error_enc;
-	}
+	// Since realloc_crtcs can deallocate planes on OTHER outputs,
+	// we actually need to reinitalise all of them
+	for (size_t i = 0; i < drm->outputs->length; ++i) {
+		struct wlr_output_state *output = drm->outputs->items[i];
+		struct wlr_output_mode *mode = output->base->current_mode;
+		struct wlr_drm_crtc *crtc = output->crtc;
 
-	wlr_drm_output_start_renderer(output);
+		if (output->state != WLR_DRM_OUTPUT_CONNECTED)
+			continue;
+
+		if (!wlr_drm_plane_renderer_init(&drm->renderer, crtc->primary,
+				mode->width, mode->height)) {
+			wlr_log(L_ERROR, "Failed to initalise renderer for plane");
+			goto error_enc;
+		}
+
+		wlr_drm_output_start_renderer(output);
+	}
 
 	drmModeFreeEncoder(enc);
 	drmModeFreeConnector(conn);
@@ -566,6 +597,19 @@ static struct wlr_output_impl output_impl = {
 	.swap_buffers = wlr_drm_output_swap_buffers,
 };
 
+static int find_id(const void *item, const void *cmp_to) {
+	const struct wlr_output_state *output = item;
+	const uint32_t *id = cmp_to;
+
+	if (output->connector < *id) {
+		return -1;
+	} else if (output->connector > *id) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
 static const int32_t subpixel_map[] = {
 	[DRM_MODE_SUBPIXEL_UNKNOWN] = WL_OUTPUT_SUBPIXEL_UNKNOWN,
 	[DRM_MODE_SUBPIXEL_HORIZONTAL_RGB] = WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB,
@@ -742,6 +786,10 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 			restore = false;
 		}
 
+		wlr_drm_plane_renderer_free(renderer, output->crtc->overlay);
+		wlr_drm_plane_renderer_free(renderer, output->crtc->primary);
+		wlr_drm_plane_renderer_free(renderer, output->crtc->cursor);
+
 		output->crtc = NULL;
 		output->possible_crtc = 0;
 		/* Fallthrough */
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index ec068cd0..feb932df 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -148,7 +148,6 @@ struct wlr_output_state {
 	uint32_t cursor_width, cursor_height;
 
 	bool pageflip_pending;
-	bool cleanup;
 };
 
 bool wlr_drm_check_features(struct wlr_backend_state *drm);
diff --git a/types/wlr_output.c b/types/wlr_output.c
index fecfe5de..e79e12d3 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -206,7 +206,7 @@ bool wlr_output_set_cursor(struct wlr_output *output,
 		output->cursor.texture = wlr_render_surface_init(output->cursor.renderer);
 	}
 
-	wlr_surface_attach_pixels(output->cursor.texture, WL_SHM_FORMAT_ABGR8888,
+	wlr_surface_attach_pixels(output->cursor.texture, WL_SHM_FORMAT_ARGB8888,
 		stride, width, height, buf);
 
 	return true;

From 1db97a9af906524b577e5f1a4f842e18a0a942a4 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sun, 6 Aug 2017 21:38:40 +1200
Subject: [PATCH 11/16] Updated DRM cursor rendering

---
 backend/drm/backend.c       |   1 +
 backend/drm/drm.c           | 169 +++++++++++++++++++++---------------
 backend/drm/drm.h           |   8 +-
 include/wlr/render/matrix.h |   6 ++
 render/matrix.c             |  60 +++++++++++++
 types/wlr_output.c          |  61 +------------
 6 files changed, 173 insertions(+), 132 deletions(-)

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index dde34003..0a378477 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -53,6 +53,7 @@ static void session_signal(struct wl_listener *listener, void *data) {
 		for (size_t i = 0; i < drm->outputs->length; ++i) {
 			struct wlr_output_state *output = drm->outputs->items[i];
 			wlr_drm_output_start_renderer(output);
+			wlr_drm_crtc_set_cursor(drm, output->crtc);
 		}
 	} else {
 		wlr_log(L_INFO, "DRM fd paused");
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 1cc52d35..5de99b78 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -15,6 +15,9 @@
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
+#include <wlr/render/matrix.h>
+#include <wlr/render/gles2.h>
+#include <wlr/render.h>
 #include "drm.h"
 #include "drm-util.h"
 
@@ -174,7 +177,7 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) {
 }
 
 static bool wlr_drm_plane_renderer_init(struct wlr_drm_renderer *renderer,
-		struct wlr_drm_plane *plane, uint32_t width, uint32_t height) {
+		struct wlr_drm_plane *plane, uint32_t width, uint32_t height, uint32_t flags) {
 	if (plane->width == width && plane->height == height) {
 		return true;
 	}
@@ -183,7 +186,7 @@ static bool wlr_drm_plane_renderer_init(struct wlr_drm_renderer *renderer,
 	plane->height = height;
 
 	plane->gbm = gbm_surface_create(renderer->gbm, width, height,
-		GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+		GBM_FORMAT_ARGB8888, GBM_BO_USE_RENDERING | flags);
 	if (!plane->gbm) {
 		wlr_log_errno(L_ERROR, "Failed to create GBM surface for plane");
 		return false;
@@ -203,8 +206,6 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer,
 	if (!renderer || !plane)
 		return;
 
-	wlr_log(L_DEBUG, "%s called", __func__);
-
 	if (plane->front)
 		gbm_surface_release_buffer(plane->gbm, plane->front);
 	if (plane->back)
@@ -215,12 +216,19 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer,
 	if (plane->gbm)
 		gbm_surface_destroy(plane->gbm);
 
+	if (plane->wlr_surf)
+		wlr_surface_destroy(plane->wlr_surf);
+	if (plane->wlr_rend)
+		wlr_renderer_destroy(plane->wlr_rend);
+
 	plane->width = 0;
 	plane->height = 0;
 	plane->egl = EGL_NO_SURFACE;
 	plane->gbm = NULL;
 	plane->front = NULL;
 	plane->back = NULL;
+	plane->wlr_rend = NULL;
+	plane->wlr_surf = NULL;
 }
 
 static void free_fb(struct gbm_bo *bo, void *data) {
@@ -480,7 +488,7 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 			continue;
 
 		if (!wlr_drm_plane_renderer_init(&drm->renderer, crtc->primary,
-				mode->width, mode->height)) {
+				mode->width, mode->height, GBM_BO_USE_SCANOUT)) {
 			wlr_log(L_ERROR, "Failed to initalise renderer for plane");
 			goto error_enc;
 		}
@@ -506,79 +514,95 @@ static void wlr_drm_output_transform(struct wlr_output_state *output,
 	output->base->transform = transform;
 }
 
-static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
-		const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height) {
-	struct wlr_backend_state *state = wl_container_of(output->renderer, state, renderer);
-	if (!buf) {
-		drmModeSetCursor(state->fd, output->crtc->id, 0, 0, 0);
+bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc) {
+	if (!crtc || !crtc->cursor || !crtc->cursor->gbm)
 		return true;
-	}
 
-	if (!gbm_device_is_format_supported(state->renderer.gbm,
-				GBM_FORMAT_ARGB8888, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE)) {
-		wlr_log(L_ERROR, "Failed to create cursor bo: ARGB8888 pixel format is "
-				"unsupported on this device");
-		return false;
-	}
+	struct wlr_drm_plane *plane = crtc->cursor;
 
-	uint64_t bo_width, bo_height;
-	int ret;
-
-	ret = drmGetCap(state->fd, DRM_CAP_CURSOR_WIDTH, &bo_width);
-	bo_width = ret ? 64 : bo_width;
-	ret = drmGetCap(state->fd, DRM_CAP_CURSOR_HEIGHT, &bo_height);
-	bo_height = ret ? 64 : bo_height;
-
-	if (width > bo_width || height > bo_width) {
-		wlr_log(L_INFO, "Cursor too large (max %dx%d)", (int)bo_width, (int)bo_height);
-		return false;
-	}
-
-	for (int i = 0; i < 2; ++i) {
-		if (output->cursor_bo[i]) {
-			continue;
-		}
-
-		output->cursor_bo[i] = gbm_bo_create(state->renderer.gbm, bo_width, bo_height,
-			GBM_FORMAT_ARGB8888, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE);
-
-		if (!output->cursor_bo[i]) {
-			wlr_log(L_ERROR, "Failed to create cursor bo");
-			return false;
-		}
-	}
-
-	struct gbm_bo *bo;
-	output->current_cursor ^= 1;
-	bo = output->cursor_bo[output->current_cursor];
-
-	uint32_t bo_stride = gbm_bo_get_stride(bo);
-	uint8_t tmp[bo_stride * height];
-	memset(tmp, 0, sizeof(tmp));
-
-	for (size_t i = 0; i < height; ++i) {
-		memcpy(tmp + i * bo_stride, buf + i * stride * 4, width * 4);
-	}
-
-	if (gbm_bo_write(bo, tmp, sizeof(tmp)) < 0) {
-		wlr_log(L_ERROR, "Failed to write cursor to bo");
-		return false;
-	}
-
-	uint32_t bo_handle = gbm_bo_get_handle(bo).u32;
-	if (drmModeSetCursor(state->fd, output->crtc->id, bo_handle, bo_width, bo_height)) {
-		wlr_log_errno(L_INFO, "Failed to set hardware cursor");
+	uint32_t bo_handle = gbm_bo_get_handle(plane->back).u32;
+	if (drmModeSetCursor(drm->fd, crtc->id, bo_handle, plane->width, plane->height)) {
+		wlr_log_errno(L_ERROR, "Failed to set hardware cursor");
 		return false;
 	}
 
 	return true;
 }
 
+static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
+		const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height) {
+	struct wlr_backend_state *drm = wl_container_of(output->renderer, drm, renderer);
+	struct wlr_drm_renderer *renderer = output->renderer;
+	struct wlr_drm_crtc *crtc = output->crtc;
+	struct wlr_drm_plane *plane = crtc->cursor;
+
+	if (!buf) {
+		drmModeSetCursor(drm->fd, crtc->id, 0, 0, 0);
+		return true;
+	}
+
+	if (!plane) {
+		plane = calloc(1, sizeof(*plane));
+		if (!plane) {
+			wlr_log_errno(L_ERROR, "Allocation failed");
+			return false;
+		}
+		crtc->cursor = plane;
+	}
+
+	if (!plane->gbm) {
+		int ret;
+		uint64_t w, h;
+		ret = drmGetCap(drm->fd, DRM_CAP_CURSOR_WIDTH, &w);
+		w = ret ? 64 : w;
+		ret = drmGetCap(drm->fd, DRM_CAP_CURSOR_HEIGHT, &h);
+		h = ret ? 64 : h;
+
+		if (width > w || height > h) {
+			wlr_log(L_INFO, "Cursor too large (max %dx%d)", (int)w, (int)h);
+			return false;
+		}
+
+		if (!wlr_drm_plane_renderer_init(renderer, plane, w, h, GBM_BO_USE_CURSOR)) {
+			wlr_log(L_ERROR, "Cannot allocate cursor resources");
+			return false;
+		}
+
+		wlr_matrix_surface(plane->matrix, plane->width, plane->height,
+			output->base->transform);
+
+		plane->wlr_rend = wlr_gles2_renderer_init();
+		if (!plane->wlr_rend)
+			return false;
+
+		plane->wlr_surf = wlr_render_surface_init(plane->wlr_rend);
+		if (!plane->wlr_surf)
+			return false;
+	}
+
+	wlr_drm_plane_make_current(renderer, plane);
+
+	wlr_surface_attach_pixels(plane->wlr_surf, WL_SHM_FORMAT_ARGB8888,
+		stride, width, height, buf);
+
+	glViewport(0, 0, plane->width, plane->height);
+	glClearColor(0, 0, 0, 0);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	float matrix[16];
+	wlr_surface_get_matrix(plane->wlr_surf, &matrix, &plane->matrix, 0, 0);
+	wlr_render_with_matrix(plane->wlr_rend, plane->wlr_surf, &matrix);
+
+	wlr_drm_plane_swap_buffers(renderer, plane);
+
+	return wlr_drm_crtc_set_cursor(drm, crtc);
+}
+
 static bool wlr_drm_output_move_cursor(struct wlr_output_state *output,
 		int x, int y) {
-	struct wlr_backend_state *state =
-		wl_container_of(output->renderer, state, renderer);
-	return !drmModeMoveCursor(state->fd, output->crtc->id, x, y);
+	struct wlr_backend_state *drm =
+		wl_container_of(output->renderer, drm, renderer);
+	return !drmModeMoveCursor(drm->fd, output->crtc->id, x, y);
 }
 
 static void wlr_drm_output_destroy(struct wlr_output_state *output) {
@@ -786,9 +810,14 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 			restore = false;
 		}
 
-		wlr_drm_plane_renderer_free(renderer, output->crtc->overlay);
-		wlr_drm_plane_renderer_free(renderer, output->crtc->primary);
-		wlr_drm_plane_renderer_free(renderer, output->crtc->cursor);
+		struct wlr_drm_crtc *crtc = output->crtc;
+		for (int i = 0; i < 3; ++i) {
+			wlr_drm_plane_renderer_free(renderer, crtc->planes[i]);
+			if (crtc->planes[i] && crtc->planes[i]->id == 0) {
+				free(crtc->planes[i]);
+				crtc->planes[i] = NULL;
+			}
+		}
 
 		output->crtc = NULL;
 		output->possible_crtc = 0;
diff --git a/backend/drm/drm.h b/backend/drm/drm.h
index feb932df..91346169 100644
--- a/backend/drm/drm.h
+++ b/backend/drm/drm.h
@@ -21,11 +21,9 @@
 struct wlr_drm_plane {
 	uint32_t type;
 	uint32_t id;
-	uint32_t fb_id;
 
 	uint32_t possible_crtcs;
 
-	int32_t x, y;
 	uint32_t width, height;
 
 	struct gbm_surface *gbm;
@@ -34,6 +32,11 @@ struct wlr_drm_plane {
 	struct gbm_bo *front;
 	struct gbm_bo *back;
 
+	// Only used by cursor
+	float matrix[16];
+	struct wlr_renderer *wlr_rend;
+	struct wlr_surface *wlr_surf;
+
 	union wlr_drm_plane_props props;
 };
 
@@ -159,5 +162,6 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *state);
 int wlr_drm_event(int fd, uint32_t mask, void *data);
 
 void wlr_drm_output_start_renderer(struct wlr_output_state *output);
+bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc);
 
 #endif
diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h
index 954207da..be6a947d 100644
--- a/include/wlr/render/matrix.h
+++ b/include/wlr/render/matrix.h
@@ -1,10 +1,16 @@
 #ifndef _WLR_RENDER_MATRIX_H
 #define _WLR_RENDER_MATRIX_H
 
+#include <stdint.h>
+
 void wlr_matrix_identity(float (*output)[16]);
 void wlr_matrix_translate(float (*output)[16], float x, float y, float z);
 void wlr_matrix_scale(float (*output)[16], float x, float y, float z);
 void wlr_matrix_rotate(float (*output)[16], float radians);
 void wlr_matrix_mul(const float (*x)[16], const float (*y)[16], float (*product)[16]);
 
+enum wl_output_transform;
+void wlr_matrix_surface(float mat[static 16], int32_t width, int32_t height,
+		enum wl_output_transform transform);
+
 #endif
diff --git a/render/matrix.c b/render/matrix.c
index 4de20e5d..c7b11efe 100644
--- a/render/matrix.c
+++ b/render/matrix.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <math.h>
+#include <wayland-server-protocol.h>
 #include <wlr/render/matrix.h>
 
 /* Obtains the index for the given row/column */
@@ -81,3 +82,62 @@ void wlr_matrix_mul(const float (*x)[16], const float (*y)[16], float (*product)
 	};
 	memcpy(*product, _product, sizeof(_product));
 }
+
+static const float transforms[][4] = {
+	[WL_OUTPUT_TRANSFORM_NORMAL] = {
+		1.0f, 0.0f,
+		0.0f, -1.0f,
+	},
+	[WL_OUTPUT_TRANSFORM_90] = {
+		0.0f, -1.0f,
+		-1.0f, 0.0f,
+	},
+	[WL_OUTPUT_TRANSFORM_180] = {
+		-1.0f, 0.0f,
+		0.0f, 1.0f,
+	},
+	[WL_OUTPUT_TRANSFORM_270] = {
+		0.0f, 1.0f,
+		1.0f, 0.0f,
+	},
+	[WL_OUTPUT_TRANSFORM_FLIPPED] = {
+		-1.0f, 0.0f,
+		0.0f, -1.0f,
+	},
+	[WL_OUTPUT_TRANSFORM_FLIPPED_90] = {
+		0.0f, 1.0f,
+		-1.0f, 0.0f,
+	},
+	[WL_OUTPUT_TRANSFORM_FLIPPED_180] = {
+		1.0f, 0.0f,
+		0.0f, 1.0f,
+	},
+	[WL_OUTPUT_TRANSFORM_FLIPPED_270] = {
+		0.0f, -1.0f,
+		1.0f, 0.0f,
+	},
+};
+
+// Equivilent to glOrtho(0, width, 0, height, 1, -1) with the transform applied
+void wlr_matrix_surface(float mat[static 16], int32_t width, int32_t height,
+		enum wl_output_transform transform) {
+	memset(mat, 0, sizeof(*mat) * 16);
+
+	const float *t = transforms[transform];
+	float x = 2.0f / width;
+	float y = 2.0f / height;
+
+	// Rotation + relection
+	mat[0] = x * t[0];
+	mat[1] = x * t[1];
+	mat[4] = y * t[2];
+	mat[5] = y * t[3];
+
+	// Translation
+	mat[3] = -copysign(1.0f, mat[0] + mat[1]);
+	mat[7] = -copysign(1.0f, mat[4] + mat[5]);
+
+	// Identity
+	mat[10] = 1.0f;
+	mat[15] = 1.0f;
+}
diff --git a/types/wlr_output.c b/types/wlr_output.c
index e79e12d3..7d3cdbed 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -88,67 +88,8 @@ struct wl_global *wlr_output_create_global(
 	return wl_global;
 }
 
-static const float transforms[][4] = {
-	[WL_OUTPUT_TRANSFORM_NORMAL] = {
-		1.0f, 0.0f,
-		0.0f, -1.0f,
-	},
-	[WL_OUTPUT_TRANSFORM_90] = {
-		0.0f, -1.0f,
-		-1.0f, 0.0f,
-	},
-	[WL_OUTPUT_TRANSFORM_180] = {
-		-1.0f, 0.0f,
-		0.0f, 1.0f,
-	},
-	[WL_OUTPUT_TRANSFORM_270] = {
-		0.0f, 1.0f,
-		1.0f, 0.0f,
-	},
-	[WL_OUTPUT_TRANSFORM_FLIPPED] = {
-		-1.0f, 0.0f,
-		0.0f, -1.0f,
-	},
-	[WL_OUTPUT_TRANSFORM_FLIPPED_90] = {
-		0.0f, 1.0f,
-		-1.0f, 0.0f,
-	},
-	[WL_OUTPUT_TRANSFORM_FLIPPED_180] = {
-		1.0f, 0.0f,
-		0.0f, 1.0f,
-	},
-	[WL_OUTPUT_TRANSFORM_FLIPPED_270] = {
-		0.0f, -1.0f,
-		1.0f, 0.0f,
-	},
-};
-
-// Equivilent to glOrtho(0, width, 0, height, 1, -1) with the transform applied
-static void set_matrix(float mat[static 16], int32_t width, int32_t height,
-		enum wl_output_transform transform) {
-	memset(mat, 0, sizeof(*mat) * 16);
-
-	const float *t = transforms[transform];
-	float x = 2.0f / width;
-	float y = 2.0f / height;
-
-	// Rotation + relection
-	mat[0] = x * t[0];
-	mat[1] = x * t[1];
-	mat[4] = y * t[2];
-	mat[5] = y * t[3];
-
-	// Translation
-	mat[3] = -copysign(1.0f, mat[0] + mat[1]);
-	mat[7] = -copysign(1.0f, mat[4] + mat[5]);
-
-	// Identity
-	mat[10] = 1.0f;
-	mat[15] = 1.0f;
-}
-
 void wlr_output_update_matrix(struct wlr_output *output) {
-	set_matrix(output->transform_matrix, output->width, output->height, output->transform);
+	wlr_matrix_surface(output->transform_matrix, output->width, output->height, output->transform);
 }
 
 struct wlr_output *wlr_output_create(struct wlr_output_impl *impl,

From d307c2f2c267a2226c4b279da334b1964272cf18 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sun, 6 Aug 2017 21:42:36 +1200
Subject: [PATCH 12/16] Renamed some variables to be less generic

---
 backend/drm/drm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 5de99b78..67a48dda 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -753,8 +753,8 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *drm) {
 static void page_flip_handler(int fd, unsigned seq,
 		unsigned tv_sec, unsigned tv_usec, void *user) {
 	struct wlr_output_state *output = user;
-	struct wlr_backend_state *state =
-		wl_container_of(output->renderer, state, renderer);
+	struct wlr_backend_state *drm =
+		wl_container_of(output->renderer, drm, renderer);
 
 	struct wlr_drm_plane *plane = output->crtc->primary;
 	if (plane->front) {
@@ -763,7 +763,7 @@ static void page_flip_handler(int fd, unsigned seq,
 	}
 
 	output->pageflip_pending = false;
-	if (output->state == WLR_DRM_OUTPUT_CONNECTED && state->session->active) {
+	if (output->state == WLR_DRM_OUTPUT_CONNECTED && drm->session->active) {
 		wl_signal_emit(&output->base->events.frame, output->base);
 	}
 }
@@ -800,7 +800,7 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 	}
 
 	struct wlr_drm_renderer *renderer = output->renderer;
-	struct wlr_backend_state *state = wl_container_of(renderer, state, renderer);
+	struct wlr_backend_state *drm = wl_container_of(renderer, drm, renderer);
 
 	switch (output->state) {
 	case WLR_DRM_OUTPUT_CONNECTED:
@@ -828,7 +828,7 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
 			restore_output(output, renderer->fd);
 		}
 		wlr_log(L_INFO, "Emmiting destruction signal for '%s'", output->base->name);
-		wl_signal_emit(&state->base->events.output_remove, output->base);
+		wl_signal_emit(&drm->base->events.output_remove, output->base);
 		break;
 	case WLR_DRM_OUTPUT_DISCONNECTED:
 		break;

From 5f7042a1f22247b478b6225c3e1356c72cdd72ba Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sun, 6 Aug 2017 21:49:04 +1200
Subject: [PATCH 13/16] Moved headers

---
 backend/drm/backend.c                             | 4 ++--
 backend/drm/drm-properties.c                      | 2 +-
 backend/drm/drm-util.c                            | 2 +-
 backend/drm/drm.c                                 | 4 ++--
 {backend/drm => include/backend}/drm-properties.h | 0
 {backend/drm => include/backend}/drm-util.h       | 0
 {backend/drm => include/backend}/drm.h            | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {backend/drm => include/backend}/drm-properties.h (100%)
 rename {backend/drm => include/backend}/drm-util.h (100%)
 rename {backend/drm => include/backend}/drm.h (100%)

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 0a378477..68eae890 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -12,8 +12,8 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/list.h>
 #include <wlr/util/log.h>
-#include <backend/udev.h>
-#include "drm.h"
+#include "backend/udev.h"
+#include "backend/drm.h"
 
 static bool wlr_drm_backend_init(struct wlr_backend_state *drm) {
 	wlr_drm_scan_connectors(drm);
diff --git a/backend/drm/drm-properties.c b/backend/drm/drm-properties.c
index 391ae38c..1b6e745f 100644
--- a/backend/drm/drm-properties.c
+++ b/backend/drm/drm-properties.c
@@ -5,7 +5,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <wlr/util/log.h>
-#include "drm-properties.h"
+#include "backend/drm-properties.h"
 
 /*
  * Creates a mapping between property names and an array index where to store
diff --git a/backend/drm/drm-util.c b/backend/drm/drm-util.c
index 68f35fe0..6159b5de 100644
--- a/backend/drm/drm-util.c
+++ b/backend/drm/drm-util.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <drm.h>
 #include <drm_mode.h>
-#include "drm-util.h"
+#include "backend/drm-util.h"
 
 int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
 	int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 67a48dda..d739edad 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -18,8 +18,8 @@
 #include <wlr/render/matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
-#include "drm.h"
-#include "drm-util.h"
+#include "backend/drm.h"
+#include "backend/drm-util.h"
 
 bool wlr_drm_check_features(struct wlr_backend_state *drm) {
 	if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
diff --git a/backend/drm/drm-properties.h b/include/backend/drm-properties.h
similarity index 100%
rename from backend/drm/drm-properties.h
rename to include/backend/drm-properties.h
diff --git a/backend/drm/drm-util.h b/include/backend/drm-util.h
similarity index 100%
rename from backend/drm/drm-util.h
rename to include/backend/drm-util.h
diff --git a/backend/drm/drm.h b/include/backend/drm.h
similarity index 100%
rename from backend/drm/drm.h
rename to include/backend/drm.h

From 5a636b21ba8c8a42e827fbef24cced82f012ae5b Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sun, 6 Aug 2017 21:51:34 +1200
Subject: [PATCH 14/16] Remove old fields

---
 include/backend/drm.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/backend/drm.h b/include/backend/drm.h
index 91346169..9bdd79fd 100644
--- a/include/backend/drm.h
+++ b/include/backend/drm.h
@@ -145,10 +145,6 @@ struct wlr_output_state {
 	drmModeCrtc *old_crtc;
 
 	struct wlr_drm_renderer *renderer;
-	struct gbm_bo *bo[2];
-	struct gbm_bo *cursor_bo[2];
-	int current_cursor;
-	uint32_t cursor_width, cursor_height;
 
 	bool pageflip_pending;
 };

From dbe66d19639c637641482d7f37ae11f986a5feb7 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Mon, 7 Aug 2017 10:15:05 +1200
Subject: [PATCH 15/16] Style changes

---
 backend/drm/drm.c | 79 +++++++++++++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 27 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index d739edad..edcff083 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -145,8 +145,9 @@ error_res:
 }
 
 void wlr_drm_resources_free(struct wlr_backend_state *drm) {
-	if (!drm)
+	if (!drm) {
 		return;
+	}
 
 	free(drm->crtcs);
 	free(drm->planes);
@@ -169,8 +170,9 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
 }
 
 void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) {
-	if (!renderer)
+	if (!renderer) {
 		return;
+	}
 
 	wlr_egl_free(&renderer->egl);
 	gbm_device_destroy(renderer->gbm);
@@ -203,23 +205,30 @@ static bool wlr_drm_plane_renderer_init(struct wlr_drm_renderer *renderer,
 
 static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer,
 		struct wlr_drm_plane *plane) {
-	if (!renderer || !plane)
+	if (!renderer || !plane) {
 		return;
+	}
 
-	if (plane->front)
+	if (plane->front) {
 		gbm_surface_release_buffer(plane->gbm, plane->front);
-	if (plane->back)
+	}
+	if (plane->back) {
 		gbm_surface_release_buffer(plane->gbm, plane->back);
+	}
 
-	if (plane->egl)
+	if (plane->egl) {
 		eglDestroySurface(renderer->egl.display, plane->egl);
-	if (plane->gbm)
+	}
+	if (plane->gbm) {
 		gbm_surface_destroy(plane->gbm);
+	}
 
-	if (plane->wlr_surf)
+	if (plane->wlr_surf) {
 		wlr_surface_destroy(plane->wlr_surf);
-	if (plane->wlr_rend)
+	}
+	if (plane->wlr_rend) {
 		wlr_renderer_destroy(plane->wlr_rend);
+	}
 
 	plane->width = 0;
 	plane->height = 0;
@@ -242,8 +251,9 @@ static void free_fb(struct gbm_bo *bo, void *data) {
 
 static uint32_t get_fb_for_bo(struct gbm_bo *bo) {
 	uint32_t id = (uintptr_t)gbm_bo_get_user_data(bo);
-	if (id)
+	if (id) {
 		return id;
+	}
 
 	struct gbm_device *gbm = gbm_bo_get_device(bo);
 	drmModeAddFB(gbm_device_get_fd(gbm), gbm_bo_get_width(bo), gbm_bo_get_height(bo),
@@ -262,8 +272,9 @@ static void wlr_drm_plane_make_current(struct wlr_drm_renderer *renderer,
 
 static void wlr_drm_plane_swap_buffers(struct wlr_drm_renderer *renderer,
 		struct wlr_drm_plane *plane) {
-	if (plane->front)
+	if (plane->front) {
 		gbm_surface_release_buffer(plane->gbm, plane->front);
+	}
 
 	eglSwapBuffers(renderer->egl.display, plane->egl);
 
@@ -337,30 +348,34 @@ static void wlr_drm_output_enable(struct wlr_output_state *output, bool enable)
 static void realloc_planes(struct wlr_backend_state *drm, const uint32_t *crtc_in) {
 	// overlay, primary, cursor
 	for (int type = 0; type < 3; ++type) {
-		if (drm->num_type_planes[type] == 0)
+		if (drm->num_type_planes[type] == 0) {
 			continue;
+		}
 
 		uint32_t possible[drm->num_type_planes[type]];
 		uint32_t crtc[drm->num_crtcs];
 		uint32_t crtc_res[drm->num_crtcs];
 
-		for (size_t i = 0; i < drm->num_type_planes[type]; ++i)
+		for (size_t i = 0; i < drm->num_type_planes[type]; ++i) {
 			possible[i] = drm->type_planes[type][i].possible_crtcs;
+		}
 
 		for (size_t i = 0; i < drm->num_crtcs; ++i) {
-			if (crtc_in[i] == UNMATCHED)
+			if (crtc_in[i] == UNMATCHED) {
 				crtc[i] = SKIP;
-			else if (drm->crtcs[i].planes[type])
+			} else if (drm->crtcs[i].planes[type]) {
 				crtc[i] = drm->crtcs[i].planes[type] - drm->type_planes[type];
-			else
+			} else {
 				crtc[i] = UNMATCHED;
+			}
 		}
 
 		match_obj(drm->num_type_planes[type], possible, drm->num_crtcs, crtc, crtc_res);
 
 		for (size_t i = 0; i < drm->num_crtcs; ++i) {
-			if (crtc_res[i] == UNMATCHED || crtc_res[i] == SKIP)
+			if (crtc_res[i] == UNMATCHED || crtc_res[i] == SKIP) {
 				continue;
+			}
 
 			struct wlr_drm_crtc *c = &drm->crtcs[i];
 			struct wlr_drm_plane **old = &c->planes[type];
@@ -389,11 +404,13 @@ static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state
 	size_t index;
 	for (size_t i = 0; i < drm->outputs->length; ++i) {
 		struct wlr_output_state *o = drm->outputs->items[i];
-		if (o == output)
+		if (o == output) {
 			index = i;
+		}
 
-		if (o->state != WLR_DRM_OUTPUT_CONNECTED)
+		if (o->state != WLR_DRM_OUTPUT_CONNECTED) {
 			continue;
+		}
 
 		possible_crtc[i] = o->possible_crtc;
 		crtc[o->crtc - drm->crtcs] = i;
@@ -405,19 +422,23 @@ static void realloc_crtcs(struct wlr_backend_state *drm, struct wlr_output_state
 	bool matched = false;
 	for (size_t i = 0; i < drm->num_crtcs; ++i) {
 		// We don't want any of the current monitors to be deactivated.
-		if (crtc[i] != UNMATCHED && crtc_res[i] == UNMATCHED)
+		if (crtc[i] != UNMATCHED && crtc_res[i] == UNMATCHED) {
 			return;
-		if (crtc_res[i] == index)
+		}
+		if (crtc_res[i] == index) {
 			matched = true;
+		}
 	}
 
 	// There is no point doing anything if this monitor doesn't get activated
-	if (!matched)
+	if (!matched) {
 		return;
+	}
 
 	for (size_t i = 0; i < drm->num_crtcs; ++i) {
-		if (crtc_res[i] == UNMATCHED)
+		if (crtc_res[i] == UNMATCHED) {
 			continue;
+		}
 
 		if (crtc_res[i] != crtc[i]) {
 			struct wlr_output_state *o = drm->outputs->items[crtc_res[i]];
@@ -484,8 +505,9 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output,
 		struct wlr_output_mode *mode = output->base->current_mode;
 		struct wlr_drm_crtc *crtc = output->crtc;
 
-		if (output->state != WLR_DRM_OUTPUT_CONNECTED)
+		if (output->state != WLR_DRM_OUTPUT_CONNECTED) {
 			continue;
+		}
 
 		if (!wlr_drm_plane_renderer_init(&drm->renderer, crtc->primary,
 				mode->width, mode->height, GBM_BO_USE_SCANOUT)) {
@@ -515,8 +537,9 @@ static void wlr_drm_output_transform(struct wlr_output_state *output,
 }
 
 bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc) {
-	if (!crtc || !crtc->cursor || !crtc->cursor->gbm)
+	if (!crtc || !crtc->cursor || !crtc->cursor->gbm) {
 		return true;
+	}
 
 	struct wlr_drm_plane *plane = crtc->cursor;
 
@@ -572,12 +595,14 @@ static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
 			output->base->transform);
 
 		plane->wlr_rend = wlr_gles2_renderer_init();
-		if (!plane->wlr_rend)
+		if (!plane->wlr_rend) {
 			return false;
+		}
 
 		plane->wlr_surf = wlr_render_surface_init(plane->wlr_rend);
-		if (!plane->wlr_surf)
+		if (!plane->wlr_surf) {
 			return false;
+		}
 	}
 
 	wlr_drm_plane_make_current(renderer, plane);

From d09ca20a4dccd7696423fc9f17acc88b7b3a7986 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Mon, 7 Aug 2017 21:07:42 +1200
Subject: [PATCH 16/16] Use gbm_bo_map for cursor

---
 backend/drm/drm.c     | 43 ++++++++++++++++++++++++++++++++++++++-----
 backend/egl.c         |  2 +-
 include/backend/drm.h |  1 +
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index edcff083..700eb554 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -10,7 +10,8 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <gbm.h>
-#include <GLES3/gl3.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 #include <wayland-server.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
@@ -229,6 +230,9 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer,
 	if (plane->wlr_rend) {
 		wlr_renderer_destroy(plane->wlr_rend);
 	}
+	if (plane->cursor_bo) {
+		gbm_bo_destroy(plane->cursor_bo);
+	}
 
 	plane->width = 0;
 	plane->height = 0;
@@ -238,6 +242,7 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer,
 	plane->back = NULL;
 	plane->wlr_rend = NULL;
 	plane->wlr_surf = NULL;
+	plane->cursor_bo = NULL;
 }
 
 static void free_fb(struct gbm_bo *bo, void *data) {
@@ -543,7 +548,7 @@ bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc
 
 	struct wlr_drm_plane *plane = crtc->cursor;
 
-	uint32_t bo_handle = gbm_bo_get_handle(plane->back).u32;
+	uint32_t bo_handle = gbm_bo_get_handle(plane->cursor_bo).u32;
 	if (drmModeSetCursor(drm->fd, crtc->id, bo_handle, plane->width, plane->height)) {
 		wlr_log_errno(L_ERROR, "Failed to set hardware cursor");
 		return false;
@@ -586,13 +591,22 @@ static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
 			return false;
 		}
 
-		if (!wlr_drm_plane_renderer_init(renderer, plane, w, h, GBM_BO_USE_CURSOR)) {
+		if (!wlr_drm_plane_renderer_init(renderer, plane, w, h, 0)) {
 			wlr_log(L_ERROR, "Cannot allocate cursor resources");
 			return false;
 		}
 
+		plane->cursor_bo = gbm_bo_create(renderer->gbm, w, h, GBM_FORMAT_ARGB8888,
+			GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE);
+		if (!plane->cursor_bo) {
+			wlr_log_errno(L_ERROR, "Failed to create cursor bo");
+			return false;
+		}
+
+		// OpenGL will read the pixels out upside down,
+		// so we need to flip the image vertically
 		wlr_matrix_surface(plane->matrix, plane->width, plane->height,
-			output->base->transform);
+			output->base->transform ^ WL_OUTPUT_TRANSFORM_FLIPPED_180);
 
 		plane->wlr_rend = wlr_gles2_renderer_init();
 		if (!plane->wlr_rend) {
@@ -605,21 +619,40 @@ static bool wlr_drm_output_set_cursor(struct wlr_output_state *output,
 		}
 	}
 
+	struct gbm_bo *bo = plane->cursor_bo;
+	uint32_t bo_width = gbm_bo_get_width(bo);
+	uint32_t bo_height = gbm_bo_get_height(bo);
+	uint32_t bo_stride;
+	void *bo_data;
+
+	if (!gbm_bo_map(bo, 0, 0, bo_width, bo_height,
+			GBM_BO_TRANSFER_WRITE, &bo_stride, &bo_data)) {
+		wlr_log_errno(L_ERROR, "Unable to map buffer");
+		return false;
+	}
+
 	wlr_drm_plane_make_current(renderer, plane);
 
 	wlr_surface_attach_pixels(plane->wlr_surf, WL_SHM_FORMAT_ARGB8888,
 		stride, width, height, buf);
 
 	glViewport(0, 0, plane->width, plane->height);
-	glClearColor(0, 0, 0, 0);
+	glClearColor(0.0, 0.0, 0.0, 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	float matrix[16];
 	wlr_surface_get_matrix(plane->wlr_surf, &matrix, &plane->matrix, 0, 0);
 	wlr_render_with_matrix(plane->wlr_rend, plane->wlr_surf, &matrix);
 
+	glFinish();
+	glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, bo_stride);
+	glReadPixels(0, 0, plane->width, plane->height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, bo_data);
+	glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
+
 	wlr_drm_plane_swap_buffers(renderer, plane);
 
+	gbm_bo_unmap(bo, bo_data);
+
 	return wlr_drm_crtc_set_cursor(drm, crtc);
 }
 
diff --git a/backend/egl.c b/backend/egl.c
index 8bb05f6f..2ac1e77c 100644
--- a/backend/egl.c
+++ b/backend/egl.c
@@ -99,7 +99,7 @@ static bool egl_get_config(EGLDisplay disp, EGLConfig *out, EGLenum platform) {
 			continue;
 		}
 
-		if (gbm_format == GBM_FORMAT_XRGB8888) {
+		if (gbm_format == GBM_FORMAT_ARGB8888) {
 			*out = configs[i];
 			return true;
 		}
diff --git a/include/backend/drm.h b/include/backend/drm.h
index 9bdd79fd..0d1bc80d 100644
--- a/include/backend/drm.h
+++ b/include/backend/drm.h
@@ -36,6 +36,7 @@ struct wlr_drm_plane {
 	float matrix[16];
 	struct wlr_renderer *wlr_rend;
 	struct wlr_surface *wlr_surf;
+	struct gbm_bo *cursor_bo;
 
 	union wlr_drm_plane_props props;
 };