Skip to content

fix(kms): recover from DRM master handoff failure - #2636

Open
francocarballar wants to merge 1 commit into
pop-os:masterfrom
francocarballar:fix/drm-master-handoff
Open

fix(kms): recover from DRM master handoff failure#2636
francocarballar wants to merge 1 commit into
pop-os:masterfrom
francocarballar:fix/drm-master-handoff

Conversation

@francocarballar

Copy link
Copy Markdown

Closes #2635

Summary

  • Detect missing DRM authentication on the primary KMS device before compositor readiness.
  • Abort startup so systemd retries the session handoff with a fresh DRM descriptor.
  • Preserve secondary/render-only device behavior.
  • Fix existing Clippy warnings required by CI.

Root cause

When the greeter still owns DRM master during startup, Smithay can initialize the device as unprivileged. cosmic-comp previously continued startup and announced readiness, leaving the graphical session on a black screen.

Validation

  • cargo +stable fmt --all -- --check
  • cargo +stable clippy --all-features -- -D warnings
  • cargo +stable check --all-targets
  • cargo +stable check --no-default-features
  • cargo +stable check --features debug
  • cargo +stable check --features profile-with-tracy
  • cargo +stable check --features profile-with-tracy-gpu
  • cargo +stable test --all-features
  • git diff --check

All automated checks passed.

Hardware validation on the affected Dell Latitude 3520 has not been performed yet because reproducing the DRM handoff can make the graphical session unavailable.

Contributor declarations

  • AI-assisted code was disclosed in the commit message, as required by the repository template.
  • I understand the changes and will respond to review comments.
  • The commit includes a DCO sign-off with git commit -s.

Abort startup before readiness when the primary DRM device is not authenticated, allowing systemd to retry the session handoff with a fresh descriptor. Also fix existing Clippy warnings required by CI.

AI-assisted: developed with assistance from OpenAI Codex.
Signed-off-by: Franco Carballar <francocarballar@gmail.com>
@Drakulix

Copy link
Copy Markdown
Member

This is not the correct solution to this issue. Rather what needs to be fixed is the greeter keeping the drm master state.

Which was already done (but not yet tagged) in #2382

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.

Black screen after cosmic-comp 4d370cd update on Dell Latitude 3520 with Intel Iris Xe

2 participants