1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
|
From ed6cfbcf67221810f324a9889175c147728cf634 Mon Sep 17 00:00:00 2001
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Tue, 12 Apr 2022 15:12:27 +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 0daf943..34c26f9 100644
--- a/meson.build
+++ b/meson.build
@@ -193,6 +193,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 7540fe3..771b7ce 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;
@@ -877,11 +879,13 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
int use_pixman = 0;
bool use_shadow;
bool without_input = false;
+ char *drm_lease_name = NULL;
int ret;
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
{ 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 },
{ WESTON_OPTION_BOOLEAN, "continue-without-input", false, &without_input }
@@ -889,6 +893,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
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);
@@ -920,6 +925,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;
}
@@ -1789,6 +1795,7 @@ error_compositor:
free(modules);
modules = NULL;
+ release_drm_lease(ivi.drm_lease);
weston_compositor_destroy(ivi.compositor);
weston_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 78d1acd..8fe460b 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
|
