mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ucan, Emre (ADITG/SW1) 2017-03-08 15:43:18 +00:00 committed by Pekka Paalanen
parent 156bd065c9
commit 38ea2d2254
4 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compositor/main.c
View File

@ -562,7 +562,6 @@ usage(int error_code)
#if defined(BUILD_DRM_COMPOSITOR) #if defined(BUILD_DRM_COMPOSITOR)
fprintf(stderr, fprintf(stderr,
"Options for drm-backend.so:\n\n" "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" " --seat=SEAT\t\tThe seat that weston should run on\n"
" --tty=TTY\t\tThe tty to use\n" " --tty=TTY\t\tThe tty to use\n"
" --use-pixman\t\tUse the pixman (CPU) renderer\n" " --use-pixman\t\tUse the pixman (CPU) renderer\n"
@ -1222,7 +1221,6 @@ load_drm_backend(struct weston_compositor *c,
wet->drm_use_current_mode = false; wet->drm_use_current_mode = false;
const struct weston_option options[] = { const struct weston_option options[] = {
{ WESTON_OPTION_INTEGER, "connector", 0, &config.connector },
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id }, { WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
{ WESTON_OPTION_INTEGER, "tty", 0, &config.tty }, { WESTON_OPTION_INTEGER, "tty", 0, &config.tty },
{ WESTON_OPTION_BOOLEAN, "current-mode", 0, &wet->drm_use_current_mode }, { WESTON_OPTION_BOOLEAN, "current-mode", 0, &wet->drm_use_current_mode },

12
libweston/compositor-drm.c
View File

@ -183,7 +183,6 @@ struct drm_backend {
int32_t cursor_width; int32_t cursor_width;
int32_t cursor_height; int32_t cursor_height;
uint32_t connector;
uint32_t pageflip_timeout; uint32_t pageflip_timeout;
}; };
@ -3411,9 +3410,7 @@ create_outputs(struct drm_backend *b, struct udev_device *drm_device)
if (connector == NULL) if (connector == NULL)
continue; continue;
if (connector->connection == DRM_MODE_CONNECTED && if (connector->connection == DRM_MODE_CONNECTED) {
(b->connector == 0 ||
connector->connector_id == b->connector)) {
ret = create_output_for_connector(b, resources, ret = create_output_for_connector(b, resources,
connector, drm_device); connector, drm_device);
if (ret < 0) if (ret < 0)
@ -3466,11 +3463,6 @@ update_outputs(struct drm_backend *b, struct udev_device *drm_device)
continue; continue;
} }
if (b->connector && (b->connector != connector_id)) {
drmModeFreeConnector(connector);
continue;
}
connected[i] = connector_id; connected[i] = connector_id;
if (drm_output_find_by_connector(b, connector_id)) { if (drm_output_find_by_connector(b, connector_id)) {
@ -4067,8 +4059,6 @@ drm_backend_create(struct weston_compositor *compositor,
goto err_sprite; goto err_sprite;
} }
b->connector = config->connector;
if (create_outputs(b, drm_device) < 0) { if (create_outputs(b, drm_device) < 0) {
weston_log("failed to create output for %s\n", b->drm.filename); weston_log("failed to create output for %s\n", b->drm.filename);
goto err_udev_input; goto err_udev_input;

8
libweston/compositor-drm.h
View File

@ -35,7 +35,7 @@
extern "C" { extern "C" {
#endif #endif
#define WESTON_DRM_BACKEND_CONFIG_VERSION 2 #define WESTON_DRM_BACKEND_CONFIG_VERSION 3
struct libinput_device; struct libinput_device;
@ -98,12 +98,6 @@ weston_drm_output_get_api(struct weston_compositor *compositor)
struct weston_drm_backend_config { struct weston_drm_backend_config {
struct weston_backend_config base; 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. */ /** The tty to be used. Set to 0 to use the current tty. */
int tty; int tty;

5
man/weston-drm.man
View File

@ -87,11 +87,6 @@ When the DRM backend is loaded,
.B weston .B weston
will understand the following additional command line options. will understand the following additional command line options.
.TP .TP
\fB\-\-connector\fR=\fIconnectorid\fR
Use the connector with id number
.I connectorid
as the only initial output.
.TP
.B \-\-current\-mode .B \-\-current\-mode
By default, use the current video mode of all outputs, instead of By default, use the current video mode of all outputs, instead of
switching to the monitor preferred mode. switching to the monitor preferred mode.