This repository has been archived by the owner on Nov 1, 2021. It is now read-only.
backend/session: misc. refactoring, replace CanGraphical with udev #2465
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When wlr_session_open_file fails, don't return the FD, otherwise the caller will think the call succeeded.
Instead of operating on FDs in {open,close}_device, operate on
wlr_devices. This avoids the device lookup in wlr_session and allows
callers to have access to wlr_device fields.
For now, we use it to remove wlr_session_signal_add and replace it with
a more idiomatic wlr_session.events.change field. In the future, other
events will be added.
We're only interested in card devices. The loop over wlr_session.devices would take care of ignoring non-card events, but a future patch will listen to udev "add" events as well.
This is triggered when a new DRM card is added. An easy way to test this patch is `modprobe vkms`.
Wait for a DRM device if none is found in wlr_session_find_gpus. This
can happen if the compositor is loaded before the display kernel driver.
This supersedes the logind CanGraphical property.
To test, e.g. with i915 and sway:
rmmod -f i915
sway &
modprobe i915
Closes: swaywm#2093
We now use udev to wait for DRM card devices. This reverts commit 3ebf079.
emersion
force-pushed
the
session-signals
branch
from
724bc0a
to
606e1a4
Compare
This is more idiomatic wlroots API. The new name makes it clear that the signal is emitted when wlr_session.active changes.
This makes it easier to figure out how wlroots selected the session.
If a GPU doesn't show up in 10s, bail out and return zero GPUs.
emersion
force-pushed
the
session-signals
branch
from
0518e1b
to
e3e77f9
Compare
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See individual commits.
This PR refactors
wlr_sessionto prepare support for GPU hotplug. cc @neon64wlr_deviceis used instead. This allows callers to directly listen onwlr_deviceevents. This will be useful for a future "remove" event.add_drm_cardevent is introduced. It's used to replace the logind-specificCanGraphicalproperty.eventsstruct, for consistency with the rest of wlroots.Breaking changes:
wlr_drm_backend_createtakes awlr_deviceinstead of a DRM FDwlr_device.signalhas been replaced bywlr_device.events.changewlr_session.session_signalhas been replaced bywlr_session.events.activewlr_session_open_fileandwlr_session_close_filenow take awlr_deviceinstead of a FDwlr_session_find_gpusnow fills an array ofwlr_devicepointers instead of an array of FDs