Skip to content

Commit 5e4fa39

Browse files
StaticRocketpraneethbajjuri
authored andcommitted
feat: add info about new display manager emptty
Inform the user about the new display manager and how that interacts with the Weston session. Update other sections accordingly. Signed-off-by: Randolph Sapp <[email protected]>
1 parent 7feedc2 commit 5e4fa39

File tree

2 files changed

+27
-33
lines changed

2 files changed

+27
-33
lines changed

source/linux/Foundational_Components/Graphics/Common/Weston.rst

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,42 +34,43 @@ information.
3434
# weston --drm-device=card0 --additional-devices=card1
3535
3636
You may also modify the weston service to have systemd do this automatically
37-
on launch by using ``systemctl edit weston`` and inserting the following:
37+
on launch by editing :file:`/usr/share/wayland-sessions/weston.desktop` and
38+
modifying the ``Exec`` line:
3839

3940
.. code-block:: ini
4041
41-
[Serivce]
42-
ExecStart=/usr/bin/weston --modules=systemd-notify.so --drm-device=card0 --additional-devices=card1
42+
[Desktop Entry]
43+
Exec=weston --drm-device=card0 --additional-devices=card1
4344
4445
Please note, however, that Weston cannot use by-path identifiers and
4546
consistent naming of DRI devices is not the default behavior.
4647

47-
****************************
48-
Starting Weston with Systemd
49-
****************************
48+
***************************
49+
Starting Weston with Emptty
50+
***************************
5051

51-
Starting with Weston 10, the preferred way to start Weston is with the
52-
``weston`` user using the systemd service. If you need to interact with this
53-
instance using any other user then make sure that user is in the ``wayland`` or
54-
``root`` group and direct them to interact with that instance using the global
55-
socket at ``/run/wayland-0``.
52+
Starting with SDK 11.0, the preferred way to start Weston is with the ``weston``
53+
user using the display manager ``emptty``. Emptty is a console based display
54+
manager that coordinates the loading of devices with the initialization of any
55+
specified graphical environment. By default, it is configured to automatically
56+
start ``weston`` under the weston user on device startup.
5657

57-
This global socket is special in that it will automatically launch Weston when
58-
a GUI application attempts to connect to it. A profile script in
59-
``/etc/profile.d`` will automatically set the ``WAYLAND_DISPLAY`` environment
60-
variable if the user has sufficient permission to interact with the socket.
58+
If you need to interact with this instance using any other user then make sure
59+
that user is capable of interacting with the wayland socket :file:`wayland-1`
60+
under the weston user's ``XDG_RUNTIME_DIR``, :file:`/run/user/1000/`. We do not
61+
recommend running graphical applications as root.
6162

6263
To start the systemd service manually, do the following:
6364

6465
.. code-block:: console
6566
66-
# systemctl start weston
67+
# systemctl start emptty
6768
68-
To inspect the systemd service and socket status, do the following:
69+
To inspect the systemd service status, do the following:
6970

7071
.. code-block:: console
7172
72-
# systemctl status weston.service weston.socket
73+
# systemctl status emptty
7374
7475
.. _starting-weston-manually:
7576

@@ -79,12 +80,6 @@ Starting Weston Manually
7980

8081
To launch Weston manually with the DRM backend, do the following:
8182

82-
On the target console:
83-
84-
.. code-block:: console
85-
86-
# unset WAYLAND_DISPLAY
87-
8883
On the default display:
8984

9085
.. code-block:: console
@@ -142,12 +137,12 @@ Stopping Weston
142137
Terminate all Weston clients before exiting Weston. If you have invoked
143138
Weston from the serial console, exit Weston by pressing Ctrl-C.
144139

145-
If Weston was started automatically by the init system then it can be stopped
146-
with:
140+
If Weston was started automatically by the display manager then it can be
141+
stopped with:
147142

148143
.. code-block:: console
149144
150-
# systemctl stop weston
145+
# systemctl stop emptty
151146
152147
It is also possible to invoke Weston from the native console, exit
153148
Weston by pressing Ctrl-Alt-Backspace.
@@ -208,11 +203,11 @@ line).
208203
shell=ivi-shell.so
209204
210205
After the above configuration is completed, we can restart Weston by
211-
running the following command
206+
running the following command:
212207

213208
.. code-block:: console
214209
215-
# systemctl restart weston
210+
# systemctl restart emptty
216211
217212
.. note::
218213

source/linux/Foundational_Components/Kernel/Kernel_Drivers/Camera/CSI2RX.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ Enabling camera sensors
361361
$ gst-launch-1.0 v4l2src device="/dev/video0" ! video/x-raw, width=640, height=480, format=UYVY ! autovideosink
362362
363363
# Direct KMS Sink
364-
$ systemctl stop weston
364+
$ systemctl stop emptty
365365
$ gst-launch-1.0 v4l2src device="/dev/video0" ! video/x-raw, width=640, height=480, format=UYVY ! queue ! kmssink driver-name=tidss plane-properties=s,zpos=1
366366
367367
You can also replace v4l2src with libcamerasrc above if you want to test
@@ -682,12 +682,11 @@ Enabling camera sensors
682682
auto-exposure/auto-white-balance algorithms and other pre-processing
683683
blocks.
684684

685-
You may have to stop the display server (weston) before running the below
686-
pipelines:
685+
You may have to stop the display manager before running the below pipelines:
687686

688687
.. code-block:: console
689688
690-
$ systemctl stop weston.service
689+
$ systemctl stop emptty
691690
692691
Use the following pipeline for IMX219 1920x1080 RAW8 mode:
693692

0 commit comments

Comments
 (0)