Multi-GPU DRM

backend/backend.c

@@ -109,7 +109,8 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
 	wlr_log(L_INFO, "Found %zu GPUs", num_gpus);
 
 	for (size_t i = 0; i < num_gpus; ++i) {
-		struct wlr_backend *drm = wlr_drm_backend_create(display, session, gpus[i]);
+		struct wlr_backend *drm = wlr_drm_backend_create(display, session,
+			gpus[i], primary_drm);
 		if (!drm) {
 			wlr_log(L_ERROR, "Failed to open DRM device");
 			continue;

backend/drm/backend.c

@@ -92,8 +92,9 @@ 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, int gpu_fd) {
+		struct wlr_session *session, int gpu_fd, struct wlr_backend *parent) {
 	assert(display && session && gpu_fd >= 0);
+	assert(!parent || wlr_backend_is_drm(parent));
 
 	char *name = drmGetDeviceNameFromFd2(gpu_fd);
 	drmVersion *version = drmGetVersion(gpu_fd);
@@ -116,6 +117,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 	}
 
 	drm->fd = gpu_fd;
+	drm->parent = (struct wlr_drm_backend *)parent;
 
 	drm->drm_invalidated.notify = drm_invalidated;
 	wlr_session_signal_add(session, gpu_fd, &drm->drm_invalidated);

backend/drm/drm.c

@@ -186,6 +186,10 @@ static void wlr_drm_connector_swap_buffers(struct wlr_output *output) {
 	struct wlr_drm_plane *plane = crtc->primary;
 
 	struct gbm_bo *bo = wlr_drm_surface_swap_buffers(&plane->surf);
+	if (drm->parent) {
+		bo = wlr_drm_surface_mgpu_copy(&plane->mgpu_surf, bo);
+	}
+
 	uint32_t fb_id = get_fb_for_bo(bo);
 
 	if (drm->iface->crtc_pageflip(drm, conn, crtc, fb_id, NULL)) {
@@ -217,7 +221,8 @@ void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) {
 	struct wlr_drm_crtc *crtc = conn->crtc;
 	struct wlr_drm_plane *plane = crtc->primary;
 
-	struct gbm_bo *bo = wlr_drm_surface_get_front(&plane->surf);
+	struct gbm_bo *bo = wlr_drm_surface_get_front(
+		drm->parent ? &plane->mgpu_surf : &plane->surf);
 	uint32_t fb_id = get_fb_for_bo(bo);
 
 	struct wlr_drm_mode *mode = (struct wlr_drm_mode *)conn->output.current_mode;
@@ -393,7 +398,6 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output,
 	wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", conn->output.name,
 			mode->width, mode->height, mode->refresh);
 
-	wlr_log(L_DEBUG, "%p %p", conn, drm);
 	conn->possible_crtc = get_possible_crtcs(drm->fd, conn->id);
 	if (conn->possible_crtc == 0) {
 		goto error_conn;
@@ -430,9 +434,8 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output,
 			continue;
 		}
 
-		if (!wlr_drm_surface_init(&crtc->primary->surf, &drm->renderer,
+		if (!wlr_drm_plane_surfaces_init(crtc->primary, drm,
-				mode->width, mode->height, GBM_FORMAT_XRGB8888,
+				mode->width, mode->height, GBM_FORMAT_XRGB8888)) {
-				GBM_BO_USE_SCANOUT)) {
 			wlr_log(L_ERROR, "Failed to initalise renderer for plane");
 			goto error_conn;
 		}
@@ -782,10 +785,9 @@ static void page_flip_handler(int fd, unsigned seq,
 		return;
 	}
 
-	struct wlr_drm_plane *plane = conn->crtc->primary;
+	wlr_drm_surface_post(&conn->crtc->primary->surf);
-	if (plane->surf.front) {
+	if (drm->parent) {
-		gbm_surface_release_buffer(plane->surf.gbm, plane->surf.front);
+		wlr_drm_surface_post(&conn->crtc->primary->mgpu_surf);
-		plane->surf.front = NULL;
 	}
 
 	if (drm->session->active) {
@@ -855,6 +857,7 @@ void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn) {
 		struct wlr_drm_crtc *crtc = conn->crtc;
 		for (int i = 0; i < 3; ++i) {
 			wlr_drm_surface_finish(&crtc->planes[i]->surf);
+			wlr_drm_surface_finish(&crtc->planes[i]->mgpu_surf);
 			if (crtc->planes[i] && crtc->planes[i]->id == 0) {
 				free(crtc->planes[i]);
 				crtc->planes[i] = NULL;

backend/drm/renderer.c

@@ -1,12 +1,18 @@
 #include <stdbool.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include <gbm.h>
 #include <GLES2/gl2.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+#include <wayland-util.h>
 
 #include <wlr/egl.h>
 #include <wlr/util/log.h>
+#include <wlr/render/matrix.h>
+#include <wlr/render/gles2.h>
+#include <wlr/render.h>
 #include "backend/drm/drm.h"
 
 bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
@@ -22,6 +28,9 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) {
 		return false;
 	}
 
+	struct wlr_drm_backend *drm = wl_container_of(renderer, drm, renderer);
+	renderer->wlr_rend = wlr_gles2_renderer_create(&drm->backend);
+
 	renderer->fd = fd;
 	return true;
 }
@@ -121,3 +130,111 @@ struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_surface *surf) {
 	glClear(GL_COLOR_BUFFER_BIT);
 	return wlr_drm_surface_swap_buffers(surf);
 }
+
+void wlr_drm_surface_post(struct wlr_drm_surface *surf) {
+	if (surf->front) {
+		gbm_surface_release_buffer(surf->gbm, surf->front);
+		surf->front = NULL;
+	}
+}
+
+struct tex {
+	struct wlr_egl *egl;
+	EGLImageKHR img;
+	struct wlr_texture *tex;
+};
+
+static void free_eglimage(struct gbm_bo *bo, void *data) {
+	struct tex *tex = data;
+
+	wlr_egl_destroy_image(tex->egl, tex->img);
+	wlr_texture_destroy(tex->tex);
+	free(tex);
+}
+
+static struct wlr_texture *get_tex_for_bo(struct wlr_drm_renderer *renderer, struct gbm_bo *bo) {
+	struct tex *tex = gbm_bo_get_user_data(bo);
+	if (tex) {
+		return tex->tex;
+	}
+
+	tex = malloc(sizeof(*tex));
+	if (!tex) {
+		wlr_log_errno(L_ERROR, "Allocation failed");
+		return NULL;
+	}
+
+	tex->egl = &renderer->egl;
+
+	int dmabuf_fd = gbm_bo_get_fd(bo);
+	uint32_t width = gbm_bo_get_width(bo);
+	uint32_t height = gbm_bo_get_height(bo);
+
+	EGLint attribs[] = {
+		EGL_WIDTH, width,
+		EGL_HEIGHT, height,
+		EGL_LINUX_DRM_FOURCC_EXT, gbm_bo_get_format(bo),
+		EGL_DMA_BUF_PLANE0_FD_EXT, dmabuf_fd,
+		EGL_DMA_BUF_PLANE0_OFFSET_EXT, gbm_bo_get_offset(bo, 0),
+		EGL_DMA_BUF_PLANE0_PITCH_EXT, gbm_bo_get_stride_for_plane(bo, 0),
+		EGL_IMAGE_PRESERVED_KHR, EGL_FALSE,
+		EGL_NONE,
+	};
+
+	tex->img = renderer->egl.eglCreateImageKHR(renderer->egl.display, EGL_NO_CONTEXT,
+		EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
+	if (!tex->img) {
+		wlr_log(L_ERROR, "Failed to create EGL image: %s", egl_error());
+		abort();
+	}
+
+	tex->tex = wlr_render_texture_create(renderer->wlr_rend);
+	wlr_texture_upload_eglimage(tex->tex, tex->img, width, height);
+
+	gbm_bo_set_user_data(bo, tex, free_eglimage);
+
+	return tex->tex;
+}
+
+struct gbm_bo *wlr_drm_surface_mgpu_copy(struct wlr_drm_surface *dest, struct gbm_bo *src) {
+	wlr_drm_surface_make_current(dest);
+
+	struct wlr_texture *tex = get_tex_for_bo(dest->renderer, src);
+
+	static const float matrix[16] = {
+		[0] = 2.0f,
+		[3] = -1.0f,
+		[5] = 2.0f,
+		[7] = -1.0f,
+		[10] = 1.0f,
+		[15] = 1.0f,
+	};
+
+	glViewport(0, 0, dest->width, dest->height);
+	glClearColor(0.0, 0.0, 0.0, 1.0);
+	glClear(GL_COLOR_BUFFER_BIT);
+	wlr_render_with_matrix(dest->renderer->wlr_rend, tex, &matrix);
+
+	return wlr_drm_surface_swap_buffers(dest);
+}
+
+bool wlr_drm_plane_surfaces_init(struct wlr_drm_plane *plane, struct wlr_drm_backend *drm,
+		int32_t width, uint32_t height, uint32_t format) {
+	if (!drm->parent) {
+		return wlr_drm_surface_init(&plane->surf, &drm->renderer, width, height,
+			format, GBM_BO_USE_SCANOUT);
+	}
+
+	if (!wlr_drm_surface_init(&plane->surf, &drm->parent->renderer,
+			width, height, format, GBM_BO_USE_LINEAR)) {
+		return false;
+	}
+
+	if (!wlr_drm_surface_init(&plane->mgpu_surf, &drm->renderer,
+			width, height, format, GBM_BO_USE_SCANOUT)) {
+		wlr_drm_surface_finish(&plane->surf);
+		return false;
+	}
+
+	return true;
+}

include/backend/drm/drm.h

@@ -26,6 +26,7 @@ struct wlr_drm_plane {
 	uint32_t possible_crtcs;
 
 	struct wlr_drm_surface surf;
+	struct wlr_drm_surface mgpu_surf;
 
 	// Only used by cursor
 	float matrix[16];
@@ -58,6 +59,7 @@ struct wlr_drm_crtc {
 struct wlr_drm_backend {
 	struct wlr_backend backend;
 
+	struct wlr_drm_backend *parent;
 	const struct wlr_drm_interface *iface;
 
 	int fd;

include/backend/drm/renderer.h

@@ -7,10 +7,16 @@
 #include <EGL/egl.h>
 #include <gbm.h>
 
+#include <wlr/render.h>
+
+struct wlr_drm_plane;
+
 struct wlr_drm_renderer {
 	int fd;
 	struct gbm_device *gbm;
 	struct wlr_egl egl;
+
+	struct wlr_renderer *wlr_rend;
 };
 
 struct wlr_drm_surface {
@@ -33,9 +39,14 @@ bool wlr_drm_surface_init(struct wlr_drm_surface *surf,
 	struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
 	uint32_t format, uint32_t flags);
 
+bool wlr_drm_plane_surfaces_init(struct wlr_drm_plane *plane, struct wlr_drm_backend *drm,
+		int32_t width, uint32_t height, uint32_t format);
+
 void wlr_drm_surface_finish(struct wlr_drm_surface *surf);
 void wlr_drm_surface_make_current(struct wlr_drm_surface *surf);
 struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_surface *surf);
 struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_surface *surf);
+void wlr_drm_surface_post(struct wlr_drm_surface *surf);
+struct gbm_bo *wlr_drm_surface_mgpu_copy(struct wlr_drm_surface *dest, struct gbm_bo *src);
 
 #endif

include/wlr/backend/drm.h

@@ -6,7 +6,7 @@
 #include <wlr/backend.h>
 
 struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
-		struct wlr_session *session, int gpu_fd);
+	struct wlr_session *session, int gpu_fd, struct wlr_backend *parent);
 
 bool wlr_backend_is_drm(struct wlr_backend *backend);
 

include/wlr/render.h

@@ -2,6 +2,8 @@
 #define WLR_RENDER_H
 
 #include <stdint.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 #include <wayland-server-protocol.h>
 #include <wlr/types/wlr_output.h>
 
@@ -93,8 +95,11 @@ bool wlr_texture_upload_shm(struct wlr_texture *tex, uint32_t format,
  * texture. The wl_resource is not used after this call.
  * Will fail (return false) if the given resource is no drm buffer.
  */
- bool wlr_texture_upload_drm(struct wlr_texture *tex,
+bool wlr_texture_upload_drm(struct wlr_texture *tex,
- 	struct wl_resource *drm_buffer);
+	struct wl_resource *drm_buffer);
+
+bool wlr_texture_upload_eglimage(struct wlr_texture *tex,
+	EGLImageKHR image, uint32_t width, uint32_t height);
 
 /**
  * Copies a rectangle of pixels from a wl_shm_buffer onto the texture. The

include/wlr/render/interface.h

@@ -2,6 +2,8 @@
 #define WLR_RENDER_INTERFACE_H
 
 #include <wayland-server-protocol.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 #include <stdbool.h>
 #include <wlr/render.h>
 #include <wlr/types/wlr_output.h>
@@ -45,6 +47,8 @@ struct wlr_texture_impl {
 		int x, int y, int width, int height, struct wl_shm_buffer *shm);
 	bool (*upload_drm)(struct wlr_texture *texture,
 		struct wl_resource *drm_buf);
+	bool (*upload_eglimage)(struct wlr_texture *texture, EGLImageKHR image,
+		uint32_t width, uint32_t height);
 	void (*get_matrix)(struct wlr_texture *state,
 		float (*matrix)[16], const float (*projection)[16], int x, int y);
 	void (*get_buffer_size)(struct wlr_texture *texture,

render/gles2/texture.c

@@ -205,6 +205,25 @@ static bool gles2_texture_upload_drm(struct wlr_texture *_tex,
 	return true;
 }
 
+static bool gles2_texture_upload_eglimage(struct wlr_texture *wlr_tex,
+		EGLImageKHR image, uint32_t width, uint32_t height) {
+	struct wlr_gles2_texture *tex = (struct wlr_gles2_texture *)wlr_tex;
+
+	tex->image = image;
+	tex->pixel_format = &external_pixel_format;
+	tex->wlr_texture.valid = true;
+	tex->wlr_texture.width = width;
+	tex->wlr_texture.height = height;
+
+	gles2_texture_ensure_texture(tex);
+
+	GL_CALL(glActiveTexture(GL_TEXTURE0));
+	GL_CALL(glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex->tex_id));
+	GL_CALL(glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, tex->image));
+
+	return true;
+}
+
 static void gles2_texture_get_matrix(struct wlr_texture *_texture,
 		float (*matrix)[16], const float (*projection)[16], int x, int y) {
 	struct wlr_gles2_texture *texture = (struct wlr_gles2_texture *)_texture;
@@ -270,6 +289,7 @@ static struct wlr_texture_impl wlr_texture_impl = {
 	.upload_shm = gles2_texture_upload_shm,
 	.update_shm = gles2_texture_update_shm,
 	.upload_drm = gles2_texture_upload_drm,
+	.upload_eglimage = gles2_texture_upload_eglimage,
 	.get_matrix = gles2_texture_get_matrix,
 	.get_buffer_size = gles2_texture_get_buffer_size,
 	.bind = gles2_texture_bind,

render/wlr_texture.c

@@ -48,6 +48,11 @@ bool wlr_texture_upload_drm(struct wlr_texture *texture,
 	return texture->impl->upload_drm(texture, drm_buffer);
 }
 
+bool wlr_texture_upload_eglimage(struct wlr_texture *texture,
+		EGLImageKHR image, uint32_t width, uint32_t height) {
+	return texture->impl->upload_eglimage(texture, image, width, height);
+}
+
 void wlr_texture_get_matrix(struct wlr_texture *texture,
 		float (*matrix)[16], const float (*projection)[16], int x, int y) {
 	texture->impl->get_matrix(texture, matrix, projection, x, y);