summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2017-03-28 18:14:37 +0300
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2017-12-18 13:58:17 +0200
commit8a9c8b08cf7b1bf911af181580b7045cb65af5df (patch)
tree676bfbddfefb2ea946eab5da3d4b5a5fd69eb90d
parentb45ed8baf0312915f30aa55b7d380379593edfd5 (diff)
weston: add --drm-device option for DRM-backend
Developers with testing rigs having multiple graphics cards plugged in often want to test things on a specific card. We have ways to choose a card through seat assignments, but configuring that run by run is awkward. Add a command line option for opening a specific DRM device. v2: call it --drm-device instead of --device Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com>
-rw-r--r--compositor/main.c2
-rw-r--r--man/weston-drm.man7
2 files changed, 9 insertions, 0 deletions
diff --git a/compositor/main.c b/compositor/main.c
index 32fb33e8..7feb4cb0 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -565,6 +565,7 @@ usage(int error_code)
"Options for drm-backend.so:\n\n"
" --seat=SEAT\t\tThe seat that weston should run on\n"
" --tty=TTY\t\tThe tty to use\n"
+ " --drm-device=CARD\tThe DRM device to use, e.g. \"card0\".\n"
" --use-pixman\t\tUse the pixman (CPU) renderer\n"
" --current-mode\tPrefer current KMS mode over EDID preferred mode\n\n");
#endif
@@ -1225,6 +1226,7 @@ load_drm_backend(struct weston_compositor *c,
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
{ WESTON_OPTION_INTEGER, "tty", 0, &config.tty },
+ { WESTON_OPTION_STRING, "drm-device", 0, &config.specific_device },
{ WESTON_OPTION_BOOLEAN, "current-mode", 0, &wet->drm_use_current_mode },
{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &config.use_pixman },
};
diff --git a/man/weston-drm.man b/man/weston-drm.man
index d7fd5614..75d79021 100644
--- a/man/weston-drm.man
+++ b/man/weston-drm.man
@@ -91,6 +91,13 @@ will understand the following additional command line options.
By default, use the current video mode of all outputs, instead of
switching to the monitor preferred mode.
.TP
+\fB\-\-drm\-device\fR=\fIcardN\fR
+Use the DRM device
+.I cardN
+instead of the default heuristics based on seat assignments and boot VGA
+status. For example, use
+.BR card0 .
+.TP
\fB\-\-seat\fR=\fIseatid\fR
Use graphics and input devices designated for seat
.I seatid