compositor-drm: remove connector option
Remove the option, because it is hard to use.
Drm connector ids are hard to reach for users,
and they can change when kernel or device tree
is modified.
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
[Pekka: bump WESTON_DRM_BACKEND_CONFIG_VERSION]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/compositor/main.c b/compositor/main.c
index f8a60e9..0615d87 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -562,7 +562,6 @@
#if defined(BUILD_DRM_COMPOSITOR)
fprintf(stderr,
"Options for drm-backend.so:\n\n"
- " --connector=ID\tBring up only this connector\n"
" --seat=SEAT\t\tThe seat that weston should run on\n"
" --tty=TTY\t\tThe tty to use\n"
" --use-pixman\t\tUse the pixman (CPU) renderer\n"
@@ -1222,7 +1221,6 @@
wet->drm_use_current_mode = false;
const struct weston_option options[] = {
- { WESTON_OPTION_INTEGER, "connector", 0, &config.connector },
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
{ WESTON_OPTION_INTEGER, "tty", 0, &config.tty },
{ WESTON_OPTION_BOOLEAN, "current-mode", 0, &wet->drm_use_current_mode },
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 0259c63..1a96138 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -183,7 +183,6 @@
int32_t cursor_width;
int32_t cursor_height;
- uint32_t connector;
uint32_t pageflip_timeout;
};
@@ -3411,9 +3410,7 @@
if (connector == NULL)
continue;
- if (connector->connection == DRM_MODE_CONNECTED &&
- (b->connector == 0 ||
- connector->connector_id == b->connector)) {
+ if (connector->connection == DRM_MODE_CONNECTED) {
ret = create_output_for_connector(b, resources,
connector, drm_device);
if (ret < 0)
@@ -3466,11 +3463,6 @@
continue;
}
- if (b->connector && (b->connector != connector_id)) {
- drmModeFreeConnector(connector);
- continue;
- }
-
connected[i] = connector_id;
if (drm_output_find_by_connector(b, connector_id)) {
@@ -4067,8 +4059,6 @@
goto err_sprite;
}
- b->connector = config->connector;
-
if (create_outputs(b, drm_device) < 0) {
weston_log("failed to create output for %s\n", b->drm.filename);
goto err_udev_input;
diff --git a/libweston/compositor-drm.h b/libweston/compositor-drm.h
index 0870719..8181492 100644
--- a/libweston/compositor-drm.h
+++ b/libweston/compositor-drm.h
@@ -35,7 +35,7 @@
extern "C" {
#endif
-#define WESTON_DRM_BACKEND_CONFIG_VERSION 2
+#define WESTON_DRM_BACKEND_CONFIG_VERSION 3
struct libinput_device;
@@ -98,12 +98,6 @@
struct weston_drm_backend_config {
struct weston_backend_config base;
- /** The connector id of the output to be initialized.
- *
- * A value of 0 will enable all available outputs.
- */
- int connector;
-
/** The tty to be used. Set to 0 to use the current tty. */
int tty;
diff --git a/man/weston-drm.man b/man/weston-drm.man
index 35d62ae..d7fd561 100644
--- a/man/weston-drm.man
+++ b/man/weston-drm.man
@@ -87,11 +87,6 @@
.B weston
will understand the following additional command line options.
.TP
-\fB\-\-connector\fR=\fIconnectorid\fR
-Use the connector with id number
-.I connectorid
-as the only initial output.
-.TP
.B \-\-current\-mode
By default, use the current video mode of all outputs, instead of
switching to the monitor preferred mode.