meta-agl-drm-lease: Add DRM lease support to agl-compositor

Allow agl-compositor to use a DRM lease as its output so
that it can be run in parallel with weston or other
applications that output via a DRM lease.

This will also allow the agl-demo-platform GUI to start
on boot when the agl-drm-lease dist feature is enabled.

AGL-Bug: SPEC-3838

Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Change-Id: I32f25eec1931fa93c563f5bc99edc9bfda132342

3 files changed, 221 insertions, 0 deletions

diff --git a/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor-init.bbappend b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor-init.bbappend
new file mode 100644
index 00000000..8ffc61c2
--- /dev/null
+++ b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor-init.bbappend
@@ -0,0 +1,3 @@
+DRM_LEASE_DEVICE ??= "card0-HDMI-A-1"
+AGL_COMPOSITOR_ARGS:append = " --drm-lease=${DRM_LEASE_DEVICE}"
+
diff --git a/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch
new file mode 100644
index 00000000..e199d0f8
--- /dev/null
+++ b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor/0001-Add-drm-lease-support.patch
@@ -0,0 +1,212 @@
+From 31ee2e33899d09610b30ac0671b2c700104fbe8f Mon Sep 17 00:00:00 2001
+From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
+Date: Tue, 1 Mar 2022 15:39:42 +0900
+Subject: [PATCH] Add drm-lease support
+
+Add an option to use a DRM lease instead of a DRM device
+as the video output.  This will allow agl-compositor to
+operate alongside other applications output via a DRM
+lease.
+
+Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
+---
+ meson.build          |  6 +++++
+ meson_options.txt    |  7 ++++++
+ src/compositor.c     |  7 ++++++
+ src/drm-lease.c      | 52 ++++++++++++++++++++++++++++++++++++++++++++
+ src/drm-lease.h      | 19 ++++++++++++++++
+ src/ivi-compositor.h |  3 +++
+ 6 files changed, 94 insertions(+)
+ create mode 100644 src/drm-lease.c
+ create mode 100644 src/drm-lease.h
+
+diff --git a/meson.build b/meson.build
+index bc8961d..67a6d5e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -194,6 +194,12 @@ elif policy_to_install == 'rba'
+   message('Installing rba policy')
+ endif
+ 
++if get_option('drm-lease')
++  deps_libweston += dependency('libdlmclient')
++  srcs_agl_compositor += 'src/drm-lease.c'
++  config_h.set('HAVE_DRM_LEASE', '1')
++endif
++
+ # From meson documentation:
+ # In order to look for headers in a specific directory you can use args :
+ # '-I/extra/include/dir, but this should only be used in exceptional cases for
+diff --git a/meson_options.txt b/meson_options.txt
+index dd1f3c0..89de273 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -5,3 +5,10 @@ option(
+ 	value: 'allow-all',
+ 	description: 'Default policy when no specific policy was set'
+ )
++
++option(
++	'drm-lease',
++	type: 'boolean',
++	value: false,
++	description: 'Support for running weston with a leased DRM Master'
++)
+diff --git a/src/compositor.c b/src/compositor.c
+index 2bbdce8..0289594 100644
+--- a/src/compositor.c
++++ b/src/compositor.c
+@@ -64,6 +64,8 @@
+ #include <waltham-transmitter/transmitter_api.h>
+ #endif
+ 
++#include "drm-lease.h"
++
+ static int cached_tm_mday = -1;
+ static struct weston_log_scope *log_scope;
+ 
+@@ -876,18 +878,21 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
+ 	int use_current_mode = 0;
+ 	int use_pixman = 0;
+ 	bool use_shadow;
++	char *drm_lease_name = NULL;
+ 	int ret;
+ 
+ 	const struct weston_option options[] = {
+ 		{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
+ 		{ WESTON_OPTION_INTEGER, "tty", 0, &config.tty },
+ 		{ WESTON_OPTION_STRING, "drm-device", 0, &config.specific_device },
++		{ WESTON_OPTION_STRING, "drm-lease", 0, &drm_lease_name },
+ 		{ WESTON_OPTION_BOOLEAN, "current-mode", 0, &use_current_mode },
+ 		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
+ 	};
+ 
+ 	parse_options(options, ARRAY_LENGTH(options), argc, argv);
+ 	config.use_pixman = use_pixman;
++	config.device_fd = get_drm_lease(&ivi->drm_lease, drm_lease_name);
+ 	ivi->cmdline.use_current_mode = use_current_mode;
+ 
+ 	section = weston_config_get_section(ivi->config, "core", NULL, NULL);
+@@ -916,6 +921,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
+ error:
+ 	free(config.gbm_format);
+ 	free(config.seat_id);
++	free(drm_lease_name);
+ 	return ret;
+ }
+ 
+@@ -1768,6 +1774,7 @@ int wet_main(int argc, char *argv[])
+ 	wl_display_destroy_clients(display);
+ 
+ error_compositor:
++	release_drm_lease(ivi.drm_lease);
+ 	weston_compositor_tear_down(ivi.compositor);
+ 
+ 	weston_compositor_log_scope_destroy(log_scope);
+diff --git a/src/drm-lease.c b/src/drm-lease.c
+new file mode 100644
+index 0000000..887277d
+--- /dev/null
++++ b/src/drm-lease.c
+@@ -0,0 +1,52 @@
++/*
++ * Copyright © 2022 IGEL Co., 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 "drm-lease.h"
++
++#include <libweston/libweston.h>
++
++int get_drm_lease(struct dlm_lease **drm_lease, const char *drm_lease_name) {
++	if (!drm_lease_name)
++		return -1;
++
++	int drm_fd = -1;
++	struct dlm_lease *lease = dlm_get_lease(drm_lease_name);
++	if (lease) {
++		drm_fd = dlm_lease_fd(lease);
++		if (drm_fd < 0)
++		        dlm_release_lease(lease);
++	}
++	if (drm_fd < 0)
++		weston_log("Could not get DRM lease %s\n", drm_lease_name);
++
++	*drm_lease = lease;
++	return drm_fd;
++}
++
++void release_drm_lease(struct dlm_lease *lease) {
++	if (lease)
++		dlm_release_lease(lease);
++}
++
+diff --git a/src/drm-lease.h b/src/drm-lease.h
+new file mode 100644
+index 0000000..9fdc428
+--- /dev/null
++++ b/src/drm-lease.h
+@@ -0,0 +1,19 @@
++#ifndef DRM_LEASE_H
++#define DRM_LEASE_H
++
++#include "config.h"
++
++#ifdef HAVE_DRM_LEASE
++#include <dlmclient.h>
++int get_drm_lease(struct dlm_lease **drm_lease, const char *drm_lease_name);
++void release_drm_lease(struct dlm_lease *drm_lease);
++#else
++struct dlm_lease;
++static int get_drm_lease(struct dlm_lease **drm_lease, const char *drm_lease_name) {
++	return -1;
++}
++static void release_drm_lease(struct dlm_lease *drm_lease) {
++}
++
++#endif
++#endif /* DRM_LEASE_H */
+diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
+index e89d215..f053848 100644
+--- a/src/ivi-compositor.h
++++ b/src/ivi-compositor.h
+@@ -35,6 +35,7 @@
+ #include <libweston-desktop/libweston-desktop.h>
+ 
+ #include "remote.h"
++#include "drm-lease.h"
+ 
+ #include "agl-shell-server-protocol.h"
+ 
+@@ -106,6 +107,8 @@ struct ivi_compositor {
+ 	struct weston_layer panel;
+ 	struct weston_layer popup;
+ 	struct weston_layer fullscreen;
++
++	struct dlm_lease *drm_lease;
+ };
+ 
+ struct ivi_surface;
+-- 
+2.17.1
+
diff --git a/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor_git.bbappend b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor_git.bbappend
new file mode 100644
index 00000000..3c64ce1f
--- /dev/null
+++ b/meta-agl-drm-lease/recipes-graphics/agl-compositor/agl-compositor_git.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Add-drm-lease-support.patch"
+
+PACKAGECONFIG[drm-lease] = "-Ddrm-lease=true,-Ddrm-lease=false,drm-lease-manager"
+PACKAGECONFIG:append = " drm-lease"