fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 04:40:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend-drm: add config option require-outputs

Browse source 
If Weston fails to configure a DRM output for whatever reason, it will fail to
start. Depending on the use-case, this may or may not be the correct behavior.

Add the "require-outputs" option to allow configuring the error behavior on
missing outputs.

Add documentation of the possible options to the man page.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
This commit is contained in:
Michael Tretter 2023-05-31 14:09:48 +02:00 • committed by Daniel Stone
parent 98e398e78b
commit 20508c148e
2 changed files with 66 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
compositor/main.c
View file

@ -119,6 +119,12 @@ struct wet_layoutput {
struct wet_head_array add; /**< tmp: heads to add as clones */
};
enum require_outputs {
REQUIRE_OUTPUTS_ALL_FOUND,
REQUIRE_OUTPUTS_ANY,
REQUIRE_OUTPUTS_NONE,
};
struct wet_compositor {
struct weston_compositor *compositor;
struct weston_config *config;
@ -133,6 +139,7 @@ struct wet_compositor {
bool autolaunch_watch;
bool use_color_manager;
struct wl_listener screenshot_auth;
enum require_outputs require_outputs;
};
static FILE *weston_logfile = NULL;
@ -1068,6 +1075,29 @@ out:
return ret;
}
static const struct {
const char *name;
enum require_outputs mode;
} require_outputs_modes [] = {
{ "all-found", REQUIRE_OUTPUTS_ALL_FOUND },
{ "any", REQUIRE_OUTPUTS_ANY },
{ "none", REQUIRE_OUTPUTS_NONE },
};
static int
weston_parse_require_outputs(const char *name, enum require_outputs *mode)
{
unsigned int i;
for (i = 0; i < ARRAY_LENGTH(require_outputs_modes); i++)
if (strcmp(require_outputs_modes[i].name, name) == 0) {
*mode = require_outputs_modes[i].mode;
return 0;
}
return -1;
}
static int
weston_compositor_init_config(struct weston_compositor *ec,
struct weston_config *config)
@ -2530,7 +2560,7 @@ static int
drm_process_layoutputs(struct wet_compositor *wet)
{
struct wet_layoutput *lo;
int ret = 0;
int failed_layoutputs = 0;
wl_list_for_each(lo, &wet->layoutput_list, compositor_link) {
if (lo->add.n == 0)
@ -2538,11 +2568,19 @@ drm_process_layoutputs(struct wet_compositor *wet)
if (drm_process_layoutput(wet, lo) < 0) {
lo->add = (struct wet_head_array){};
ret = -1;
failed_layoutputs += 1;
continue;
}
}
return ret;
if (wet->require_outputs == REQUIRE_OUTPUTS_ALL_FOUND &&
failed_layoutputs > 0)
return -1;
if (wet->require_outputs == REQUIRE_OUTPUTS_ANY &&
failed_layoutputs == wl_list_length(&wet->layoutput_list))
return -1;
return 0;
}
static void
@ -3866,6 +3904,7 @@ wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
char *log_scopes = NULL;
char *flight_rec_scopes = NULL;
char *server_socket = NULL;
char *require_outputs = NULL;
int32_t idle_time = -1;
int32_t help = 0;
char *socket_name = NULL;
@ -4072,6 +4111,15 @@ wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
weston_config_section_get_bool(section, "require-input",
&wet.compositor->require_input, true);
wet.require_outputs = REQUIRE_OUTPUTS_ALL_FOUND;
weston_config_section_get_string(section, "require-outputs",
&require_outputs, NULL);
if (require_outputs) {
weston_parse_require_outputs(require_outputs,
&wet.require_outputs);
free(require_outputs);
}
if (load_backend(wet.compositor, backend, &argc, argv, config,
renderer) < 0) {
weston_log("fatal: failed to create compositor backend\n");

15
man/weston.ini.man
View file

@ -168,6 +168,21 @@ set to 300 seconds.
.BI "require-input=" true
require an input device for launch
.TP 7
.BI "require-outputs=" all-found
configures the behavior if Weston fails to configure and enable outputs.
Depending on the use-case, it may preferable to ensure that Weston only starts
if it can enable all available outputs, or that it ignores failed outputs. The
possible options are:
.PP
.RS 10
.nf
.BR "all-found " "all available outputs must be enabled"
.BR "any " "start if any output could be enabled"
.BR "none " "start even if no output was enabled"
.fi
.RE
.TP 7
.BI "wait-for-debugger=" true
Raises SIGSTOP before initializing the compositor. This allows the user to
attach with a debugger and continue execution by sending SIGCONT. This is