clients: drop simple-dmabuf-drm

This client contains driver-specific code to allocate buffers. However clients
shouldn't contain driver-specific code and should rely on e.g. mesa to allocate
buffers via standard interfaces.

Additionally, because the build system always tries to enable all features, some
experimental drivers and drivers that aren't included in amd64 distribution
packages were required. Users would need to manually disable some drivers.
Releasers would need to install libdrm from source (because the release process
forbids adding custom build flags). Dropping simple-dmabuf-drm simplifies both
building and releasing.

The functionality previously tested via simple-dmabuf-drm can now be tested with
simple-dmabuf-egl.

Signed-off-by: Simon Ser <contact@emersion.fr>

5 files changed, 3 insertions, 1091 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c21c6e4..d60c983b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,6 @@ container_prep:
 build-native-meson-default-options:
   variables:
     MESON_OPTIONS: >
-      -Dsimple-dmabuf-drm=intel
       -Dwerror=true
       -Ddoc=true
   extends: .build-native-meson
@@ -75,7 +74,6 @@ build-native-meson-default-options:
 build-native-meson-no-gl-renderer:
   variables:
     MESON_OPTIONS: >
-      -Dsimple-dmabuf-drm=intel
       -Dsimple-clients=damage,im,shm,touch,dmabuf-v4l
       -Drenderer-gl=false
       -Dremoting=false
diff --git a/README.md b/README.md
index eabac0df..9f1e58bf 100644
--- a/README.md
+++ b/README.md
@@ -62,14 +62,12 @@ several features if you want to avoid certain dependencies.
 
 The `meson` command populates the build directory. This step can
 fail due to missing dependencies. Any build options you want can be added on
-that line, e.g. `meson build/ --prefix=... -Dsimple-dmabuf-drm=intel`.
-All the build options can be found in the file
-[meson_options.txt](meson_options.txt).
+that line, e.g. `meson build/ --prefix=... -Ddemo-clients=false`. All the build
+options can be found in the file [meson_options.txt](meson_options.txt).
 
 Once the build directory has been successfully populated, you can inspect the
 configuration with `meson configure build/`. If you need to change an
-option, you can do e.g.
-`meson configure build/ -Dsimple-dmabuf-drm=intel`.
+option, you can do e.g. `meson configure build/ -Ddemo-clients=false`.
 
 Every push to the Weston master repository and its forks is built using GitLab
 CI. [Reading the configuration](.gitlab-ci.yml) may provide a useful example of
diff --git a/clients/meson.build b/clients/meson.build
index 7461cd2e..821bc803 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -311,51 +311,6 @@ if get_option('demo-clients')
 	endforeach
 endif
 
-simple_dmabuf_drm_opts = get_option('simple-dmabuf-drm')
-simple_dmabuf_drm_deps = []
-foreach driver : [ 'etnaviv', 'intel', 'freedreno' ]
-	if simple_dmabuf_drm_opts.contains(driver)
-		required = true
-		enabled = true
-	elif simple_dmabuf_drm_opts.contains('auto')
-		required = get_option('auto_features').enabled()
-		enabled = not get_option('auto_features').disabled()
-	else
-		enabled = false
-	endif
-
-	if enabled
-		dep = dependency('libdrm_' + driver, required: false)
-		if dep.found()
-			simple_dmabuf_drm_deps += dep
-			config_h.set('HAVE_LIBDRM_' + driver.to_upper(), 1)
-		elif required
-			error('simple-dmabuf-drm is configured to use @0@ but it was not found. Or, you can remove @1@ from \'-Dsimple-dmabuf-drm\' list.'.format('libdrm_' + driver, driver))
-		endif
-	endif
-endforeach
-if simple_dmabuf_drm_deps.length() > 0
-	executable(
-		'weston-simple-dmabuf-drm',
-		'simple-dmabuf-drm.c',
-		xdg_shell_client_protocol_h,
-		xdg_shell_protocol_c,
-		fullscreen_shell_unstable_v1_client_protocol_h,
-		fullscreen_shell_unstable_v1_protocol_c,
-		linux_dmabuf_unstable_v1_client_protocol_h,
-		linux_dmabuf_unstable_v1_protocol_c,
-		weston_direct_display_client_protocol_h,
-		weston_direct_display_protocol_c,
-		include_directories: common_inc,
-		dependencies: [
-			dep_wayland_client,
-			dep_libdrm,
-			simple_dmabuf_drm_deps
-		],
-		install: true
-	)
-endif
-
 if get_option('shell-desktop')
 	exe_keyboard = executable(
 		'weston-keyboard',
diff --git a/clients/simple-dmabuf-drm.c b/clients/simple-dmabuf-drm.c
deleted file mode 100644
index 010d39cd..00000000
--- a/clients/simple-dmabuf-drm.c
+++ /dev/null
@@ -1,1032 +0,0 @@
-/*
- * Copyright © 2011 Benjamin Franzke
- * Copyright © 2010 Intel Corporation
- * Copyright © 2014 Collabora Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "config.h"
-#include "simple-dmabuf-drm-data.h"
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <assert.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <errno.h>
-
-#include <xf86drm.h>
-
-#ifdef HAVE_LIBDRM_INTEL
-#include <i915_drm.h>
-#include <intel_bufmgr.h>
-#endif
-#ifdef HAVE_LIBDRM_FREEDRENO
-#include <freedreno/freedreno_drmif.h>
-#endif
-#ifdef HAVE_LIBDRM_ETNAVIV
-#include <etnaviv_drmif.h>
-#endif
-#include <drm_fourcc.h>
-
-#include <wayland-client.h>
-#include <libweston/zalloc.h>
-#include "xdg-shell-client-protocol.h"
-#include "fullscreen-shell-unstable-v1-client-protocol.h"
-#include "linux-dmabuf-unstable-v1-client-protocol.h"
-#include "weston-direct-display-client-protocol.h"
-
-#ifndef DRM_FORMAT_MOD_LINEAR
-#define DRM_FORMAT_MOD_LINEAR 0
-#endif
-
-struct buffer;
-
-/* Possible options that affect the displayed image */
-#define OPT_Y_INVERTED 1  /* contents has y axis inverted */
-#define OPT_IMMEDIATE  2  /* create wl_buffer immediately */
-#define OPT_DIRECT_DISPLAY  4  /* attempt to pass the dmabuf
-				  directly to the display controller */
-
-#define ALIGN(v, a) ((v + a - 1) & ~(a - 1))
-
-struct display {
-	struct wl_display *display;
-	struct wl_registry *registry;
-	struct wl_compositor *compositor;
-	struct xdg_wm_base *wm_base;
-	struct zwp_fullscreen_shell_v1 *fshell;
-	struct zwp_linux_dmabuf_v1 *dmabuf;
-	struct weston_direct_display_v1 *direct_display;
-	int xrgb8888_format_found;
-	int nv12_format_found;
-	uint64_t nv12_modifier;
-	int req_dmabuf_immediate;
-};
-
-struct drm_device {
-	int fd;
-	char *name;
-
-	int (*alloc_bo)(struct buffer *buf);
-	void (*free_bo)(struct buffer *buf);
-	int (*export_bo_to_prime)(struct buffer *buf);
-	int (*map_bo)(struct buffer *buf);
-	void (*unmap_bo)(struct buffer *buf);
-	void (*device_destroy)(struct buffer *buf);
-};
-
-struct buffer {
-	struct wl_buffer *buffer;
-	int busy;
-
-	struct drm_device *dev;
-	int drm_fd;
-
-#ifdef HAVE_LIBDRM_INTEL
-	drm_intel_bufmgr *bufmgr;
-	drm_intel_bo *intel_bo;
-#endif /* HAVE_LIBDRM_INTEL */
-#if HAVE_LIBDRM_FREEDRENO
-	struct fd_device *fd_dev;
-	struct fd_bo *fd_bo;
-#endif /* HAVE_LIBDRM_FREEDRENO */
-#if HAVE_LIBDRM_ETNAVIV
-	struct etna_device *etna_dev;
-	struct etna_bo *etna_bo;
-#endif /* HAVE_LIBDRM_ETNAVIV */
-
-	uint32_t gem_handle;
-	int dmabuf_fd;
-	uint8_t *mmap;
-
-	int width;
-	int height;
-	int bpp;
-	unsigned long stride;
-	int format;
-};
-
-#define NUM_BUFFERS 3
-
-struct window {
-	struct display *display;
-	int width, height;
-	struct wl_surface *surface;
-	struct xdg_surface *xdg_surface;
-	struct xdg_toplevel *xdg_toplevel;
-	struct buffer buffers[NUM_BUFFERS];
-	struct buffer *prev_buffer;
-	struct wl_callback *callback;
-	bool initialized;
-	bool wait_for_configure;
-};
-
-static int running = 1;
-
-static void
-redraw(void *data, struct wl_callback *callback, uint32_t time);
-
-static void
-buffer_release(void *data, struct wl_buffer *buffer)
-{
-	struct buffer *mybuf = data;
-
-	mybuf->busy = 0;
-}
-
-static const struct wl_buffer_listener buffer_listener = {
-	buffer_release
-};
-
-
-#ifdef HAVE_LIBDRM_INTEL
-static int
-intel_alloc_bo(struct buffer *my_buf)
-{
-	/* XXX: try different tiling modes for testing FB modifiers. */
-	uint32_t tiling = I915_TILING_NONE;
-
-	assert(my_buf->bufmgr);
-
-	my_buf->intel_bo = drm_intel_bo_alloc_tiled(my_buf->bufmgr, "test",
-						    my_buf->width, my_buf->height,
-						    (my_buf->bpp / 8), &tiling,
-						    &my_buf->stride, 0);
-
-	printf("buffer allocated w %d, h %d, stride %lu, size %lu\n",
-	       my_buf->width, my_buf->height, my_buf->stride, my_buf->intel_bo->size);
-
-	if (!my_buf->intel_bo)
-		return 0;
-
-	if (tiling != I915_TILING_NONE)
-		return 0;
-
-	return 1;
-}
-
-static void
-intel_free_bo(struct buffer *my_buf)
-{
-	drm_intel_bo_unreference(my_buf->intel_bo);
-}
-
-static int
-intel_map_bo(struct buffer *my_buf)
-{
-	if (drm_intel_gem_bo_map_gtt(my_buf->intel_bo) != 0)
-		return 0;
-
-	my_buf->mmap = my_buf->intel_bo->virtual;
-
-	return 1;
-}
-
-static int
-intel_bo_export_to_prime(struct buffer *buffer)
-{
-	return drm_intel_bo_gem_export_to_prime(buffer->intel_bo, &buffer->dmabuf_fd);
-}
-
-static void
-intel_unmap_bo(struct buffer *my_buf)
-{
-	drm_intel_gem_bo_unmap_gtt(my_buf->intel_bo);
-}
-
-static void
-intel_device_destroy(struct buffer *my_buf)
-{
-	drm_intel_bufmgr_destroy(my_buf->bufmgr);
-}
-
-#endif /* HAVE_LIBDRM_INTEL */
-#ifdef HAVE_LIBDRM_FREEDRENO
-
-static int
-fd_alloc_bo(struct buffer *buf)
-{
-	int flags = DRM_FREEDRENO_GEM_CACHE_WCOMBINE;
-	int size;
-
-	buf->fd_dev = fd_device_new(buf->drm_fd);
-	buf->stride = ALIGN(buf->width, 32) * buf->bpp / 8;
-	size = buf->stride * buf->height;
-	buf->fd_dev = fd_device_new(buf->drm_fd);
-	buf->fd_bo = fd_bo_new(buf->fd_dev, size, flags);
-
-	if (!buf->fd_bo)
-		return 0;
-	return 1;
-}
-
-static void
-fd_free_bo(struct buffer *buf)
-{
-	fd_bo_del(buf->fd_bo);
-}
-
-static int
-fd_bo_export_to_prime(struct buffer *buf)
-{
-	buf->dmabuf_fd = fd_bo_dmabuf(buf->fd_bo);
-	return buf->dmabuf_fd < 0;
-}
-
-static int
-fd_map_bo(struct buffer *buf)
-{
-	buf->mmap = fd_bo_map(buf->fd_bo);
-	return buf->mmap != NULL;
-}
-
-static void
-fd_unmap_bo(struct buffer *buf)
-{
-}
-
-static void
-fd_device_destroy(struct buffer *buf)
-{
-	fd_device_del(buf->fd_dev);
-}
-#endif /* HAVE_LIBDRM_FREEDRENO */
-#ifdef HAVE_LIBDRM_ETNAVIV
-
-static int
-etna_alloc_bo(struct buffer *buf)
-{
-	int flags = DRM_ETNA_GEM_CACHE_WC;
-	int size;
-
-	buf->stride = ALIGN(buf->width, 32) * buf->bpp / 8;
-	size = 	buf->stride * buf->height;
-	buf->etna_dev = etna_device_new(buf->drm_fd);
-	buf->etna_bo = etna_bo_new(buf->etna_dev, size, flags);
-
-	return buf->etna_bo != NULL;
-}
-
-static void
-etna_free_bo(struct buffer *buf)
-{
-	etna_bo_del(buf->etna_bo);
-}
-
-static int
-etna_bo_export_to_prime(struct buffer *buf)
-{
-	buf->dmabuf_fd = etna_bo_dmabuf(buf->etna_bo);
-	return buf->dmabuf_fd < 0;
-}
-
-static int
-etna_map_bo(struct buffer *buf)
-{
-	buf->mmap = etna_bo_map(buf->etna_bo);
-	return buf->mmap != NULL;
-}
-
-static void
-etna_unmap_bo(struct buffer *buf)
-{
-	if (munmap(buf->mmap, buf->stride * buf->height) < 0)
-		fprintf(stderr, "Failed to unmap buffer: %s", strerror(errno));
-	buf->mmap = NULL;
-}
-
-static void
-etna_device_destroy(struct buffer *buf)
-{
-	etna_device_del(buf->etna_dev);
-}
-#endif /* HAVE_LIBDRM_ENTAVIV */
-
-static void
-fill_content(struct buffer *my_buf, uint64_t modifier)
-{
-	int x = 0, y = 0;
-	uint32_t *pix;
-
-	assert(my_buf->mmap);
-
-	if (my_buf->format == DRM_FORMAT_NV12) {
-		if (modifier == DRM_FORMAT_MOD_SAMSUNG_64_32_TILE) {
-			pix = (uint32_t *) my_buf->mmap;
-			for (y = 0; y < my_buf->height; y++)
-				memcpy(&pix[y * my_buf->width / 4],
-				       &nv12_tiled[my_buf->width * y / 4],
-				       my_buf->width);
-		}
-		else if (modifier == DRM_FORMAT_MOD_LINEAR) {
-			uint8_t *pix8;
-			/* first plane: Y (2/3 of the buffer)	*/
-			for (y = 0; y < my_buf->height * 2/3; y++) {
-				pix8 = my_buf->mmap + y * my_buf->stride;
-				for (x = 0; x < my_buf->width; x++)
-					*pix8++ = x % 0xff;
-			}
-			/* second plane (CbCr) is half the size of Y
-			   plane (last 1/3 of the buffer) */
-			for (y = my_buf->height * 2/3; y < my_buf->height; y++) {
-				pix8 = my_buf->mmap + y * my_buf->stride;
-				for (x = 0; x < my_buf->width; x+=2) {
-					*pix8++ = x % 256;
-					*pix8++ = y % 256;
-				}
-			}
-		}
-	}
-	else {
-		for (y = 0; y < my_buf->height; y++) {
-			pix = (uint32_t *)(my_buf->mmap + y * my_buf->stride);
-			for (x = 0; x < my_buf->width; x++)
-				*pix++ = (0xff << 24) | ((x % 256) << 16) |
-					 ((y % 256) << 8) | 0xf0;
-		}
-	}
-}
-
-static void
-drm_device_destroy(struct buffer *buf)
-{
-	buf->dev->device_destroy(buf);
-	close(buf->drm_fd);
-}
-
-static int
-drm_device_init(struct buffer *buf)
-{
-	struct drm_device *dev = calloc(1, sizeof(struct drm_device));
-
-	drmVersionPtr version = drmGetVersion(buf->drm_fd);
-
-	dev->fd = buf->drm_fd;
-	dev->name = strdup(version->name);
-	if (0) {
-		/* nothing */
-	}
-#ifdef HAVE_LIBDRM_INTEL
-	else if (!strcmp(dev->name, "i915")) {
-		buf->bufmgr = drm_intel_bufmgr_gem_init(buf->drm_fd, 32);
-		if (!buf->bufmgr) {
-			free(dev->name);
-			free(dev);
-			return 0;
-		}
-		dev->alloc_bo = intel_alloc_bo;
-		dev->free_bo = intel_free_bo;
-		dev->export_bo_to_prime = intel_bo_export_to_prime;
-		dev->map_bo = intel_map_bo;
-		dev->unmap_bo = intel_unmap_bo;
-		dev->device_destroy = intel_device_destroy;
-	}
-#endif
-#ifdef HAVE_LIBDRM_FREEDRENO
-	else if (!strcmp(dev->name, "msm")) {
-		dev->alloc_bo = fd_alloc_bo;
-		dev->free_bo = fd_free_bo;
-		dev->export_bo_to_prime = fd_bo_export_to_prime;
-		dev->map_bo = fd_map_bo;
-		dev->unmap_bo = fd_unmap_bo;
-		dev->device_destroy = fd_device_destroy;
-	}
-#endif
-#ifdef HAVE_LIBDRM_ETNAVIV
-	else if (!strcmp(dev->name, "etnaviv")) {
-		dev->alloc_bo = etna_alloc_bo;
-		dev->free_bo = etna_free_bo;
-		dev->export_bo_to_prime = etna_bo_export_to_prime;
-		dev->map_bo = etna_map_bo;
-		dev->unmap_bo = etna_unmap_bo;
-		dev->device_destroy = etna_device_destroy;
-	}
-#endif
-	else {
-		fprintf(stderr, "Error: drm device %s unsupported.\n",
-			dev->name);
-		free(dev->name);
-		free(dev);
-		return 0;
-	}
-	buf->dev = dev;
-	return 1;
-}
-
-static int
-drm_connect(struct buffer *my_buf)
-{
-	/* This won't work with card0 as we need to be authenticated; instead,
-	 * boot with drm.rnodes=1 and use that. */
-	my_buf->drm_fd = open("/dev/dri/renderD128", O_RDWR);
-	if (my_buf->drm_fd < 0)
-		return 0;
-
-	return drm_device_init(my_buf);
-}
-
-static void
-drm_shutdown(struct buffer *my_buf)
-{
-	drm_device_destroy(my_buf);
-}
-
-
-static void
-create_succeeded(void *data,
-		 struct zwp_linux_buffer_params_v1 *params,
-		 struct wl_buffer *new_buffer)
-{
-	struct buffer *buffer = data;
-
-	buffer->buffer = new_buffer;
-	wl_buffer_add_listener(buffer->buffer, &buffer_listener, buffer);
-
-	zwp_linux_buffer_params_v1_destroy(params);
-}
-
-static void
-create_failed(void *data, struct zwp_linux_buffer_params_v1 *params)
-{
-	struct buffer *buffer = data;
-
-	buffer->buffer = NULL;
-	running = 0;
-
-	zwp_linux_buffer_params_v1_destroy(params);
-
-	fprintf(stderr, "Error: zwp_linux_buffer_params.create failed.\n");
-}
-
-static const struct zwp_linux_buffer_params_v1_listener params_listener = {
-	create_succeeded,
-	create_failed
-};
-
-static int
-create_dmabuf_buffer(struct display *display, struct buffer *buffer,
-		     int width, int height, int format, uint32_t opts)
-{
-	struct zwp_linux_buffer_params_v1 *params;
-	uint64_t modifier = 0;
-	uint32_t flags = 0;
-	struct drm_device *drm_dev;
-
-	if (!drm_connect(buffer)) {
-		fprintf(stderr, "drm_connect failed\n");
-		goto error;
-	}
-	drm_dev = buffer->dev;
-
-	buffer->width = width;
-	switch (format) {
-	case DRM_FORMAT_NV12:
-		/* adjust height for allocation of NV12 Y and UV planes */
-		buffer->height = height * 3 / 2;
-		buffer->bpp = 8;
-		modifier = display->nv12_modifier;
-		break;
-	default:
-		buffer->height = height;
-		buffer->bpp = 32;
-	}
-	buffer->format = format;
-
-	if (!drm_dev->alloc_bo(buffer)) {
-		fprintf(stderr, "alloc_bo failed\n");
-		goto error1;
-	}
-
-	if (!drm_dev->map_bo(buffer)) {
-		fprintf(stderr, "map_bo failed\n");
-		goto error2;
-	}
-	fill_content(buffer, modifier);
-	drm_dev->unmap_bo(buffer);
-
-	if (drm_dev->export_bo_to_prime(buffer) != 0) {
-		fprintf(stderr, "gem_export_to_prime failed\n");
-		goto error2;
-	}
-	if (buffer->dmabuf_fd < 0) {
-		fprintf(stderr, "error: dmabuf_fd < 0\n");
-		goto error2;
-	}
-
-	/* We now have a dmabuf! For format XRGB8888, it should contain 2x2
-	 * tiles (i.e. each tile is 256x256) of misc colours, and be mappable,
-	 * either as ARGB8888, or XRGB8888. For format NV12, it should contain
-	 * the Y and UV components, and needs to be re-adjusted for passing the
-	 * correct height to the compositor.
-	 */
-	buffer->height = height;
-	if (opts & OPT_Y_INVERTED)
-		flags |= ZWP_LINUX_BUFFER_PARAMS_V1_FLAGS_Y_INVERT;
-
-	params = zwp_linux_dmabuf_v1_create_params(display->dmabuf);
-
-	if ((opts & OPT_DIRECT_DISPLAY) && display->direct_display)
-		weston_direct_display_v1_enable(display->direct_display, params);
-
-	zwp_linux_buffer_params_v1_add(params,
-				       buffer->dmabuf_fd,
-				       0, /* plane_idx */
-				       0, /* offset */
-				       buffer->stride,
-				       modifier >> 32,
-				       modifier & 0xffffffff);
-
-	if (format == DRM_FORMAT_NV12) {
-		/* add the second plane params */
-		zwp_linux_buffer_params_v1_add(params,
-					       buffer->dmabuf_fd,
-					       1,
-					       buffer->width * buffer->height,
-					       buffer->stride,
-					       modifier >> 32,
-					       modifier & 0xffffffff);
-	}
-	zwp_linux_buffer_params_v1_add_listener(params, &params_listener, buffer);
-	if (display->req_dmabuf_immediate) {
-		buffer->buffer = zwp_linux_buffer_params_v1_create_immed(params,
-					  buffer->width,
-					  buffer->height,
-					  format,
-					  flags);
-		wl_buffer_add_listener(buffer->buffer, &buffer_listener, buffer);
-	}
-	else
-		zwp_linux_buffer_params_v1_create(params,
-					  buffer->width,
-					  buffer->height,
-					  format,
-					  flags);
-
-	return 0;
-
-error2:
-	drm_dev->free_bo(buffer);
-error1:
-	drm_shutdown(buffer);
-error:
-	return -1;
-}
-
-static void
-xdg_surface_handle_configure(void *data, struct xdg_surface *surface,
-			     uint32_t serial)
-{
-	struct window *window = data;
-
-	xdg_surface_ack_configure(surface, serial);
-
-	if (window->initialized && window->wait_for_configure)
-		redraw(window, NULL, 0);
-	window->wait_for_configure = false;
-}
-
-static const struct xdg_surface_listener xdg_surface_listener = {
-	xdg_surface_handle_configure,
-};
-
-static void
-xdg_toplevel_handle_configure(void *data, struct xdg_toplevel *toplevel,
-			      int32_t width, int32_t height,
-			      struct wl_array *states)
-{
-}
-
-static void
-xdg_toplevel_handle_close(void *data, struct xdg_toplevel *xdg_toplevel)
-{
-	running = 0;
-}
-
-static const struct xdg_toplevel_listener xdg_toplevel_listener = {
-	xdg_toplevel_handle_configure,
-	xdg_toplevel_handle_close,
-};
-
-static struct window *
-create_window(struct display *display, int width, int height, int format,
-	      uint32_t opts)
-{
-	struct window *window;
-	int i;
-	int ret;
-
-	window = zalloc(sizeof *window);
-	if (!window)
-		return NULL;
-
-	window->callback = NULL;
-	window->display = display;
-	window->width = width;
-	window->height = height;
-	window->surface = wl_compositor_create_surface(display->compositor);
-
-	if (display->wm_base) {
-		window->xdg_surface =
-			xdg_wm_base_get_xdg_surface(display->wm_base,
-						    window->surface);
-
-		assert(window->xdg_surface);
-
-		xdg_surface_add_listener(window->xdg_surface,
-					 &xdg_surface_listener, window);
-
-		window->xdg_toplevel =
-			xdg_surface_get_toplevel(window->xdg_surface);
-
-		assert(window->xdg_toplevel);
-
-		xdg_toplevel_add_listener(window->xdg_toplevel,
-					  &xdg_toplevel_listener, window);
-
-		xdg_toplevel_set_title(window->xdg_toplevel, "simple-dmabuf");
-
-		window->wait_for_configure = true;
-		wl_surface_commit(window->surface);
-	} else if (display->fshell) {
-		zwp_fullscreen_shell_v1_present_surface(display->fshell,
-							window->surface,
-							ZWP_FULLSCREEN_SHELL_V1_PRESENT_METHOD_DEFAULT,
-							NULL);
-	} else {
-		assert(0);
-	}
-
-	for (i = 0; i < NUM_BUFFERS; ++i) {
-		ret = create_dmabuf_buffer(display, &window->buffers[i],
-		                               width, height, format, opts);
-
-		if (ret < 0)
-			return NULL;
-	}
-
-	return window;
-}
-
-static void
-destroy_window(struct window *window)
-{
-	struct drm_device* dev;
-	int i;
-
-	if (window->callback)
-		wl_callback_destroy(window->callback);
-
-	for (i = 0; i < NUM_BUFFERS; i++) {
-		if (!window->buffers[i].buffer)
-			continue;
-
-		wl_buffer_destroy(window->buffers[i].buffer);
-		dev = window->buffers[i].dev;
-		dev->free_bo(&window->buffers[i]);
-		close(window->buffers[i].dmabuf_fd);
-		drm_shutdown(&window->buffers[i]);
-	}
-
-	if (window->xdg_toplevel)
-		xdg_toplevel_destroy(window->xdg_toplevel);
-	if (window->xdg_surface)
-		xdg_surface_destroy(window->xdg_surface);
-	wl_surface_destroy(window->surface);
-	free(window);
-}
-
-static struct buffer *
-window_next_buffer(struct window *window)
-{
-	int i;
-
-	for (i = 0; i < NUM_BUFFERS; i++)
-		if (!window->buffers[i].busy)
-			return &window->buffers[i];
-
-	return NULL;
-}
-
-static const struct wl_callback_listener frame_listener;
-
-static void
-redraw(void *data, struct wl_callback *callback, uint32_t time)
-{
-	struct window *window = data;
-	struct buffer *buffer;
-
-	buffer = window_next_buffer(window);
-	if (!buffer) {
-		fprintf(stderr,
-			!callback ? "Failed to create the first buffer.\n" :
-			"All buffers busy at redraw(). Server bug?\n");
-		abort();
-	}
-
-	/* XXX: would be nice to draw something that changes here... */
-
-	wl_surface_attach(window->surface, buffer->buffer, 0, 0);
-	wl_surface_damage(window->surface, 0, 0, window->width, window->height);
-
-	if (callback)
-		wl_callback_destroy(callback);
-
-	window->callback = wl_surface_frame(window->surface);
-	wl_callback_add_listener(window->callback, &frame_listener, window);
-	wl_surface_commit(window->surface);
-	buffer->busy = 1;
-}
-
-static const struct wl_callback_listener frame_listener = {
-	redraw
-};
-
-static void
-dmabuf_modifiers(void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf,
-		 uint32_t format, uint32_t modifier_hi, uint32_t modifier_lo)
-{
-	struct display *d = data;
-	uint64_t modifier = ((uint64_t) modifier_hi << 32) | modifier_lo;
-
-	switch (format) {
-	case DRM_FORMAT_XRGB8888:
-		d->xrgb8888_format_found = 1;
-		break;
-	case DRM_FORMAT_NV12:
-		switch (modifier) {
-		case DRM_FORMAT_MOD_SAMSUNG_64_32_TILE:
-		case DRM_FORMAT_MOD_LINEAR:
-			d->nv12_format_found = 1;
-			d->nv12_modifier = modifier;
-			break;
-		}
-	default:
-		break;
-	}
-}
-
-static void
-dmabuf_format(void *data, struct zwp_linux_dmabuf_v1 *zwp_linux_dmabuf, uint32_t format)
-{
-	/* XXX: deprecated */
-}
-
-static const struct zwp_linux_dmabuf_v1_listener dmabuf_listener = {
-	dmabuf_format,
-	dmabuf_modifiers
-};
-
-static void
-xdg_wm_base_ping(void *data, struct xdg_wm_base *shell, uint32_t serial)
-{
-	xdg_wm_base_pong(shell, serial);
-}
-
-static const struct xdg_wm_base_listener wm_base_listener = {
-	xdg_wm_base_ping,
-};
-
-static void
-registry_handle_global(void *data, struct wl_registry *registry,
-		       uint32_t id, const char *interface, uint32_t version)
-{
-	struct display *d = data;
-
-	if (strcmp(interface, "wl_compositor") == 0) {
-		d->compositor =
-			wl_registry_bind(registry,
-					 id, &wl_compositor_interface, 1);
-	} else if (strcmp(interface, "xdg_wm_base") == 0) {
-		d->wm_base = wl_registry_bind(registry,
-					      id, &xdg_wm_base_interface, 1);
-		xdg_wm_base_add_listener(d->wm_base, &wm_base_listener, d);
-	} else if (strcmp(interface, "zwp_fullscreen_shell_v1") == 0) {
-		d->fshell = wl_registry_bind(registry,
-					     id, &zwp_fullscreen_shell_v1_interface, 1);
-	} else if (strcmp(interface, "zwp_linux_dmabuf_v1") == 0) {
-		if (version < 3)
-			return;
-		d->dmabuf = wl_registry_bind(registry,
-					     id, &zwp_linux_dmabuf_v1_interface, 3);
-		zwp_linux_dmabuf_v1_add_listener(d->dmabuf, &dmabuf_listener, d);
-	} else if (strcmp(interface, "weston_direct_display_v1") == 0) {
-		d->direct_display = wl_registry_bind(registry, id,
-						     &weston_direct_display_v1_interface, 1);
-	}
-}
-
-static void
-registry_handle_global_remove(void *data, struct wl_registry *registry,
-			      uint32_t name)
-{
-}
-
-static const struct wl_registry_listener registry_listener = {
-	registry_handle_global,
-	registry_handle_global_remove
-};
-
-static struct display *
-create_display(int opts, int format)
-{
-	struct display *display;
-
-	display = malloc(sizeof *display);
-	if (display == NULL) {
-		fprintf(stderr, "out of memory\n");
-		return NULL;
-	}
-	display->display = wl_display_connect(NULL);
-	assert(display->display);
-
-	display->req_dmabuf_immediate = opts & OPT_IMMEDIATE;
-
-	display->registry = wl_display_get_registry(display->display);
-	wl_registry_add_listener(display->registry,
-				 &registry_listener, display);
-	wl_display_roundtrip(display->display);
-	if (display->dmabuf == NULL) {
-		fprintf(stderr, "No zwp_linux_dmabuf global\n");
-		return NULL;
-	}
-
-	wl_display_roundtrip(display->display);
-
-	if ((format == DRM_FORMAT_XRGB8888 && !display->xrgb8888_format_found) ||
-	        (format == DRM_FORMAT_NV12 && !display->nv12_format_found)) {
-		fprintf(stderr, "requested format is not available\n");
-		return NULL;
-	}
-	return display;
-}
-
-static void
-destroy_display(struct display *display)
-{
-	if (display->dmabuf)
-		zwp_linux_dmabuf_v1_destroy(display->dmabuf);
-
-	if (display->wm_base)
-		xdg_wm_base_destroy(display->wm_base);
-
-	if (display->fshell)
-		zwp_fullscreen_shell_v1_release(display->fshell);
-
-	if (display->compositor)
-		wl_compositor_destroy(display->compositor);
-
-	wl_registry_destroy(display->registry);
-	wl_display_flush(display->display);
-	wl_display_disconnect(display->display);
-	free(display);
-}
-
-static void
-signal_int(int signum)
-{
-	running = 0;
-}
-
-static void
-print_usage_and_exit(void)
-{
-	printf("usage flags:\n"
-		"\t'--import-immediate=<>'\n\t\t0 to import dmabuf via roundtrip,"
-		"\n\t\t1 to enable import without roundtrip\n"
-		"\t'--y-inverted=<>'\n\t\t0 to not pass Y_INVERTED flag,"
-		"\n\t\t1 to pass Y_INVERTED flag\n"
-		"\t'--import-format=<>'\n\t\tXRGB to import dmabuf as XRGB8888,"
-		"\n\t\tNV12 to import as multi plane NV12\n"
-		"\t'--direct-display=<>'\n\t\t0 not to enable direct-display,"
-		"\n\t\t1 to enable direct-display\n");
-	exit(0);
-}
-
-static int
-is_true(const char* c)
-{
-	if (!strcmp(c, "1"))
-		return 1;
-	else if (!strcmp(c, "0"))
-		return 0;
-	else
-		print_usage_and_exit();
-
-	return 0;
-}
-
-static int
-parse_import_format(const char* c)
-{
-	if (!strcmp(c, "NV12"))
-		return DRM_FORMAT_NV12;
-	else if (!strcmp(c, "XRGB"))
-		return DRM_FORMAT_XRGB8888;
-	else
-		print_usage_and_exit();
-
-	return 0;
-}
-
-int
-main(int argc, char **argv)
-{
-	struct sigaction sigint;
-	struct display *display;
-	struct window *window;
-	int opts = 0;
-	int import_format = DRM_FORMAT_XRGB8888;
-	int c, option_index, ret = 0;
-
-	static struct option long_options[] = {
-		{"import-format",    required_argument, 0,  'f' },
-		{"import-immediate", required_argument, 0,  'i' },
-		{"y-inverted",       required_argument, 0,  'y' },
-		{"direct-display",   required_argument, 0,  'g' },
-		{"help",             no_argument      , 0,  'h' },
-		{0, 0, 0, 0}
-	};
-
-	while ((c = getopt_long(argc, argv, "g:hf:i:y:",
-				  long_options, &option_index)) != -1) {
-		switch (c) {
-		case 'f':
-			import_format = parse_import_format(optarg);
-			break;
-		case 'i':
-			if (is_true(optarg))
-				opts |= OPT_IMMEDIATE;
-			break;
-		case 'y':
-			if (is_true(optarg))
-				opts |= OPT_Y_INVERTED;
-			break;
-		case 'g':
-			if (is_true(optarg))
-				opts |= OPT_DIRECT_DISPLAY;
-			break;
-		default:
-			print_usage_and_exit();
-		}
-	}
-
-	display = create_display(opts, import_format);
-	if (!display)
-		return 1;
-	window = create_window(display, 256, 256, import_format, opts);
-	if (!window)
-		return 1;
-
-	sigint.sa_handler = signal_int;
-	sigemptyset(&sigint.sa_mask);
-	sigint.sa_flags = SA_RESETHAND;
-	sigaction(SIGINT, &sigint, NULL);
-
-	/* Here we retrieve the linux-dmabuf objects if executed without immed,
-	 * or error */
-	wl_display_roundtrip(display->display);
-
-	if (!running)
-		return 1;
-
-	window->initialized = true;
-
-	if (!window->wait_for_configure)
-		redraw(window, NULL, 0);
-
-	while (running && ret != -1)
-		ret = wl_display_dispatch(display->display);
-
-	fprintf(stderr, "simple-dmabuf exiting\n");
-	destroy_window(window);
-	destroy_display(display);
-
-	return 0;
-}
diff --git a/meson_options.txt b/meson_options.txt
index d5bf1d54..c862ecc4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -172,13 +172,6 @@ option(
 	description: 'List of accessory clients to build and install'
 )
 option(
-	'simple-dmabuf-drm',
-	type: 'array',
-	choices: [ 'auto', 'intel', 'freedreno', 'etnaviv' ],
-	value: [ 'intel', 'freedreno', 'etnaviv' ],
-	description: 'List of DRM drivers to be supported by weston-simple-dmabuf-drm'
-)
-option(
 	'demo-clients',
 	type: 'boolean',
 	value: true,