drm: port the drm backend to the new init api
Preparing for libweston and for the separation of the code base into
libweston vs. weston the compositor, we must remove all uses
weston_config structures from the backends. We have decided that all
option and config input happens in the compositor (main.c), and
configuration is passed in for the backends as structs.
Most other backends have already converted, and this patch converts the
DRM-backend to the libweston-style init API.
The libweston-style init API includes a header for each backend (here
compositor-drm.h) defining the configuration interface. The compositor
(main.c) prepares a configuration struct to be passed through libweston
core to the backend during initialization.
A complication with the DRM-backend is that outputs can be hotplugged,
and their configuration needs to be fetched from the compositor
(main.c). For this, the config struct contains a callback member. The
output configuration API is subject to change later, this is just a
temporary API to get libweston forward.
As weston_compositor's user_data was not previously used for anything,
and the output configuration callback needs data, the user_data is set
to the 'config' pointer. This pointer is only used in
drm_configure_output() in main.c.
[Bryce: lots of stuff and rebasing]
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Benoit Gschwind <gschwind@gnu-log.net>
[Pekka: write commit message]
[Pekka: squash in "drm: Don't hang onto the backend config object
post-backend_init" from Bryce Harrington]
[Pekka: drop the compositor.h hunk]
[Pekka: do not #include inside extern "C"]
[Pekka: remove incorrect comment about weston_drm_backend_config
ownership.]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index a47b453..6ef706a 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -46,12 +46,13 @@
#include <gbm.h>
#include <libudev.h>
+#include "compositor.h"
+#include "compositor-drm.h"
#include "shared/helpers.h"
#include "shared/timespec-util.h"
-#include "libbacklight.h"
-#include "compositor.h"
#include "gl-renderer.h"
#include "pixman-renderer.h"
+#include "libbacklight.h"
#include "libinput-seat.h"
#include "launcher-util.h"
#include "vaapi-recorder.h"
@@ -74,17 +75,6 @@
#define GBM_BO_USE_CURSOR GBM_BO_USE_CURSOR_64X64
#endif
-static int option_current_mode = 0;
-
-enum output_config {
- OUTPUT_CONFIG_INVALID = 0,
- OUTPUT_CONFIG_OFF,
- OUTPUT_CONFIG_PREFERRED,
- OUTPUT_CONFIG_CURRENT,
- OUTPUT_CONFIG_MODE,
- OUTPUT_CONFIG_MODELINE
-};
-
struct drm_backend {
struct weston_backend base;
struct weston_compositor *compositor;
@@ -130,6 +120,18 @@
int32_t cursor_width;
int32_t cursor_height;
+
+ /** Callback used to configure the outputs.
+ *
+ * This function will be called by the backend when a new DRM
+ * output needs to be configured.
+ */
+ enum weston_drm_backend_output_mode
+ (*configure_output)(struct weston_compositor *compositor,
+ bool use_current_mode,
+ const char *name,
+ struct weston_drm_backend_output_config *output_config);
+ bool use_current_mode;
};
struct drm_mode {
@@ -220,13 +222,6 @@
uint32_t formats[];
};
-struct drm_parameters {
- int connector;
- int tty;
- int use_pixman;
- const char *seat_id;
-};
-
static struct gl_renderer_interface *gl_renderer;
static const char default_seat[] = "seat0";
@@ -2151,31 +2146,23 @@
}
static int
-get_gbm_format_from_section(struct weston_config_section *section,
- uint32_t default_value,
- uint32_t *format)
+parse_gbm_format(const char *s, uint32_t default_value, uint32_t *gbm_format)
{
- char *s;
int ret = 0;
- weston_config_section_get_string(section,
- "gbm-format", &s, NULL);
-
if (s == NULL)
- *format = default_value;
+ *gbm_format = default_value;
else if (strcmp(s, "xrgb8888") == 0)
- *format = GBM_FORMAT_XRGB8888;
+ *gbm_format = GBM_FORMAT_XRGB8888;
else if (strcmp(s, "rgb565") == 0)
- *format = GBM_FORMAT_RGB565;
+ *gbm_format = GBM_FORMAT_RGB565;
else if (strcmp(s, "xrgb2101010") == 0)
- *format = GBM_FORMAT_XRGB2101010;
+ *gbm_format = GBM_FORMAT_XRGB2101010;
else {
weston_log("fatal: unrecognized pixel format: %s\n", s);
ret = -1;
}
- free(s);
-
return ret;
}
@@ -2194,21 +2181,38 @@
* @returns A mode from the output's mode list, or NULL if none available
*/
static struct drm_mode *
-drm_output_choose_initial_mode(struct drm_output *output,
- enum output_config kind,
- int width, int height,
- const drmModeModeInfo *current_mode,
- const drmModeModeInfo *modeline)
+drm_output_choose_initial_mode(struct drm_backend *backend,
+ struct drm_output *output,
+ enum weston_drm_backend_output_mode mode,
+ struct weston_drm_backend_output_config *config,
+ const drmModeModeInfo *current_mode)
{
struct drm_mode *preferred = NULL;
struct drm_mode *current = NULL;
struct drm_mode *configured = NULL;
struct drm_mode *best = NULL;
struct drm_mode *drm_mode;
+ drmModeModeInfo modeline;
+ int32_t width = 0;
+ int32_t height = 0;
+
+ if (mode == WESTON_DRM_BACKEND_OUTPUT_PREFERRED && config->modeline) {
+ if (sscanf(config->modeline, "%dx%d", &width, &height) != 2) {
+ width = -1;
+
+ if (parse_modeline(config->modeline, &modeline) == 0) {
+ configured = drm_output_add_mode(output, &modeline);
+ if (!configured)
+ return NULL;
+ } else {
+ weston_log("Invalid modeline \"%s\" for output %s\n",
+ config->modeline, output->base.name);
+ }
+ }
+ }
wl_list_for_each_reverse(drm_mode, &output->base.mode_list, base.link) {
- if (kind == OUTPUT_CONFIG_MODE &&
- width == drm_mode->base.width &&
+ if (width == drm_mode->base.width &&
height == drm_mode->base.height)
configured = drm_mode;
@@ -2222,24 +2226,15 @@
best = drm_mode;
}
- if (kind == OUTPUT_CONFIG_MODELINE) {
- configured = drm_output_add_mode(output, modeline);
- if (!configured)
- return NULL;
- }
-
if (current == NULL && current_mode->clock != 0) {
current = drm_output_add_mode(output, current_mode);
if (!current)
return NULL;
}
- if (kind == OUTPUT_CONFIG_CURRENT)
+ if (mode == WESTON_DRM_BACKEND_OUTPUT_CURRENT)
configured = current;
- if (option_current_mode && current)
- return current;
-
if (configured)
return configured;
@@ -2303,12 +2298,11 @@
struct drm_output *output;
struct drm_mode *drm_mode, *next, *current;
struct weston_mode *m;
- struct weston_config_section *section;
- drmModeModeInfo crtc_mode, modeline;
- int i, width, height, scale;
- char *s;
- enum output_config config;
- uint32_t transform;
+
+ drmModeModeInfo crtc_mode;
+ int i;
+ enum weston_drm_backend_output_mode mode;
+ struct weston_drm_backend_output_config config = {{ 0 }};
i = find_crtc_for_connector(b, resources, connector);
if (i < 0) {
@@ -2327,42 +2321,14 @@
output->base.serial_number = "unknown";
wl_list_init(&output->base.mode_list);
- section = weston_config_get_section(b->compositor->config, "output", "name",
- output->base.name);
- weston_config_section_get_string(section, "mode", &s, "preferred");
- if (strcmp(s, "off") == 0)
- config = OUTPUT_CONFIG_OFF;
- else if (strcmp(s, "preferred") == 0)
- config = OUTPUT_CONFIG_PREFERRED;
- else if (strcmp(s, "current") == 0)
- config = OUTPUT_CONFIG_CURRENT;
- else if (sscanf(s, "%dx%d", &width, &height) == 2)
- config = OUTPUT_CONFIG_MODE;
- else if (parse_modeline(s, &modeline) == 0)
- config = OUTPUT_CONFIG_MODELINE;
- else {
- weston_log("Invalid mode \"%s\" for output %s\n",
- s, output->base.name);
- config = OUTPUT_CONFIG_PREFERRED;
- }
- free(s);
-
- weston_config_section_get_int(section, "scale", &scale, 1);
- weston_config_section_get_string(section, "transform", &s, "normal");
- if (weston_parse_transform(s, &transform) < 0)
- weston_log("Invalid transform \"%s\" for output %s\n",
- s, output->base.name);
-
- free(s);
-
- if (get_gbm_format_from_section(section,
- b->gbm_format,
- &output->gbm_format) == -1)
+ mode = b->configure_output(b->compositor, b->use_current_mode,
+ output->base.name, &config);
+ if (parse_gbm_format(config.gbm_format, b->gbm_format, &output->gbm_format) == -1)
output->gbm_format = b->gbm_format;
- weston_config_section_get_string(section, "seat", &s, "");
- setup_output_seat_constraint(b, &output->base, s);
- free(s);
+ setup_output_seat_constraint(b, &output->base,
+ config.seat ? config.seat : "");
+ free(config.seat);
output->crtc_id = resources->crtcs[i];
output->pipe = i;
@@ -2382,16 +2348,15 @@
goto err_free;
}
- if (config == OUTPUT_CONFIG_OFF) {
+ if (mode == WESTON_DRM_BACKEND_OUTPUT_OFF) {
weston_log("Disabling output %s\n", output->base.name);
drmModeSetCrtc(b->drm.fd, output->crtc_id,
0, 0, 0, 0, 0, NULL);
goto err_free;
}
- current = drm_output_choose_initial_mode(output, config,
- width, height,
- &crtc_mode, &modeline);
+ current = drm_output_choose_initial_mode(b, output, mode, &config,
+ &crtc_mode);
if (!current)
goto err_free;
output->base.current_mode = ¤t->base;
@@ -2399,7 +2364,7 @@
weston_output_init(&output->base, b->compositor, x, y,
connector->mmWidth, connector->mmHeight,
- transform, scale);
+ config.base.transform, config.base.scale);
if (b->use_pixman) {
if (drm_output_init_pixman(output, b) < 0) {
@@ -2477,6 +2442,7 @@
b->crtc_allocator &= ~(1 << output->crtc_id);
b->connector_allocator &= ~(1 << output->connector_id);
free(output);
+ free(config.modeline);
return -1;
}
@@ -2743,7 +2709,6 @@
weston_launcher_destroy(ec->launcher);
close(b->drm.fd);
-
free(b);
}
@@ -3067,15 +3032,13 @@
static struct drm_backend *
drm_backend_create(struct weston_compositor *compositor,
- struct drm_parameters *param,
- int *argc, char *argv[],
- struct weston_config *config)
+ struct weston_drm_backend_config *config)
{
struct drm_backend *b;
- struct weston_config_section *section;
struct udev_device *drm_device;
struct wl_event_loop *loop;
const char *path;
+ const char *seat_id = default_seat;
weston_log("initializing drm backend\n");
@@ -3095,18 +3058,19 @@
*/
b->sprites_are_broken = 1;
b->compositor = compositor;
+ b->use_pixman = config->use_pixman;
+ b->configure_output = config->configure_output;
+ b->use_current_mode = config->use_current_mode;
- section = weston_config_get_section(config, "core", NULL, NULL);
- if (get_gbm_format_from_section(section,
- GBM_FORMAT_XRGB8888,
- &b->gbm_format) == -1)
- goto err_base;
+ if (parse_gbm_format(config->gbm_format, GBM_FORMAT_XRGB8888, &b->gbm_format) < 0)
+ goto err_compositor;
- b->use_pixman = param->use_pixman;
+ if (config->seat_id)
+ seat_id = config->seat_id;
/* Check if we run drm-backend using weston-launch */
- compositor->launcher = weston_launcher_connect(compositor, param->tty,
- param->seat_id, true);
+ compositor->launcher = weston_launcher_connect(compositor, config->tty,
+ seat_id, true);
if (compositor->launcher == NULL) {
weston_log("fatal: drm backend should be run "
"using weston-launch binary or as root\n");
@@ -3122,7 +3086,7 @@
b->session_listener.notify = session_notify;
wl_signal_add(&compositor->session_signal, &b->session_listener);
- drm_device = find_primary_gpu(b, param->seat_id);
+ drm_device = find_primary_gpu(b, seat_id);
if (drm_device == NULL) {
weston_log("no drm device found\n");
goto err_udev;
@@ -3157,12 +3121,12 @@
create_sprites(b);
if (udev_input_init(&b->input,
- compositor, b->udev, param->seat_id) < 0) {
+ compositor, b->udev, seat_id) < 0) {
weston_log("failed to create input devices\n");
goto err_sprite;
}
- if (create_outputs(b, param->connector, drm_device) < 0) {
+ if (create_outputs(b, config->connector, drm_device) < 0) {
weston_log("failed to create output for %s\n", path);
goto err_udev_input;
}
@@ -3237,33 +3201,37 @@
udev_unref(b->udev);
err_compositor:
weston_compositor_shutdown(compositor);
-err_base:
free(b);
return NULL;
}
+static void
+config_init_to_defaults(struct weston_drm_backend_config *config)
+{
+}
+
WL_EXPORT int
-backend_init(struct weston_compositor *compositor, int *argc, char *argv[],
- struct weston_config *config,
+backend_init(struct weston_compositor *compositor,
+ int *argc, char *argv[],
+ struct weston_config *wc,
struct weston_backend_config *config_base)
{
struct drm_backend *b;
- struct drm_parameters param = { 0, };
+ struct weston_drm_backend_config config = {{ 0, }};
- const struct weston_option drm_options[] = {
- { WESTON_OPTION_INTEGER, "connector", 0, ¶m.connector },
- { WESTON_OPTION_STRING, "seat", 0, ¶m.seat_id },
- { WESTON_OPTION_INTEGER, "tty", 0, ¶m.tty },
- { WESTON_OPTION_BOOLEAN, "current-mode", 0, &option_current_mode },
- { WESTON_OPTION_BOOLEAN, "use-pixman", 0, ¶m.use_pixman },
- };
+ if (config_base == NULL ||
+ config_base->struct_version != WESTON_DRM_BACKEND_CONFIG_VERSION ||
+ config_base->struct_size > sizeof(struct weston_drm_backend_config)) {
+ weston_log("drm backend config structure is invalid\n");
+ return -1;
+ }
- param.seat_id = default_seat;
+ config_init_to_defaults(&config);
+ memcpy(&config, config_base, config_base->struct_size);
- parse_options(drm_options, ARRAY_LENGTH(drm_options), argc, argv);
-
- b = drm_backend_create(compositor, ¶m, argc, argv, config);
+ b = drm_backend_create(compositor, &config);
if (b == NULL)
return -1;
+
return 0;
}