Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic x112virtgpu support #72

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Basic x112virtgpu support #72

merged 3 commits into from
Oct 30, 2024

Conversation

asahilina
Copy link
Member

Replace the trivial X11 socket passthrough with x112virtgpu, if it is installed and DAX is enabled. This lives alongside the existing sommelier solution, so we can test both options for now.

Copy link
Collaborator

@slp slp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small change requested. Also, please add a SoB to the second commit.

crates/muvm/src/guest/mount.rs Outdated Show resolved Hide resolved
@asahilina
Copy link
Member Author

Removed the DAX check and snuck in some Clippy fixes in related code.

This now soft-depends on #96. They can be merged in any order, but x112virtgpu will only work as intended if #96 is also merged.

This lets us easily test this alternative to sommelier+XWayland without
committing to making it the default.

Signed-off-by: Asahi Lina <[email protected]>
Signed-off-by: Asahi Lina <[email protected]>
Copy link
Member

@alyssarosenzweig alyssarosenzweig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

les go

@asahilina
Copy link
Member Author

asahilina commented Oct 30, 2024

Added another commit to make this mutually exclusive with sommelier, and enabled with the --direct-x11 option. This makes it less confusing to test, and there's no real reason to aim to support sommelier+this simultaneously long term.

This also fixes dumb stuff like sommelier setting XCURSOR_SIZE to the wrong value for non-sommelier usage.

Instead of enabling X11 forwarding unconditionally but hiding it behind
the HOST_DISPLAY variable, enable it if the --direct-x11 flag is used.
In that case, directly set it as the DISPLAY environment variable.

This makes it easier for users to enable the feature and use it
correctly. Eventually, we can flip the logic of the flag to make direct
X11 the default.

Keep the server at :1 to keep churn down, and because it seems like a
generally helpful distinction, since the server is usually :0 on the
host.

Signed-off-by: Asahi Lina <[email protected]>
@slp slp merged commit e5da0be into AsahiLinux:main Oct 30, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants