Skip to content

Conversation

@calsys456
Copy link
Contributor

@calsys456 calsys456 commented Aug 20, 2025

Since switching VT will not drop DRM FD, treeland still able to draw to DRM after VT switched, which will cause wrong display render when switching VT too quickly. This commit use new treeland-ddm-v1 protocol to disable treeland global rendering before VT switching, and enable it after switching complete, thus the issue will be fixed.

Summary by Sourcery

Disable Treeland rendering around virtual terminal switches to prevent incorrect DRM output when switching VTs rapidly.

Bug Fixes:

  • Disable rendering before releasing the display and re-enable it after activating the new VT to avoid stale DRM output during fast VT switches.

Enhancements:

  • Add enableRender() and disableRender() methods in TreelandConnector to manage rendering via the treeland-ddm-v1 protocol.
  • Improve VT switch logging to explicitly show "None" when no user is associated with the next VT.

@deepin-ci-robot
Copy link

Hi @apr3vau. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sourcery-ai
Copy link

sourcery-ai bot commented Aug 20, 2025

Reviewer's Guide

Implements explicit render control via the treeland-ddm-v1 protocol by disabling global rendering before VT release and re-enabling it after VT acquisition, preventing incorrect display output when switching virtual terminals too quickly.

Sequence diagram for VT switching with explicit render control

sequenceDiagram
    participant DaemonApp
    participant TreelandConnector
    participant TreelandDDM
    participant VT
    DaemonApp->>TreelandConnector: onReleaseDisplay()
    TreelandConnector->>TreelandConnector: disableRender()
    TreelandConnector->>TreelandDDM: treeland_ddm_disable_render()
    TreelandConnector->>VT: VT_RELDISP ioctl
    DaemonApp->>TreelandConnector: onAcquireDisplay()
    TreelandConnector->>TreelandConnector: enableRender()
    TreelandConnector->>TreelandDDM: treeland_ddm_enable_render()
    TreelandConnector->>VT: Activate session
Loading

Class diagram for updated TreelandConnector render control methods

classDiagram
    class TreelandConnector {
        +void switchToUser(QString username)
        +void activateSession()
        +void deactivateSession()
        +void enableRender()
        +void disableRender()
        -wl_display *m_display
        -QSocketNotifier *m_notifier
    }
Loading

File-Level Changes

Change Details Files
Added render enable/disable APIs in TreelandConnector
  • Declared enableRender() and disableRender() in the header
  • Implemented both methods to call treeland_ddm_enable_render/disable_render and flush the Wayland display
  • Logged a warning if called when not connected
src/daemon/TreelandConnector.h
src/daemon/TreelandConnector.cpp
Hooked render control into VT switch event handlers
  • Inserted enableRender() after activating a session in onAcquireDisplay
  • Inserted disableRender() before releasing the VT in onReleaseDisplay
src/daemon/TreelandConnector.cpp
Improved debug logging in onReleaseDisplay
  • Changed qDebug format to print “None” when no user is found instead of an empty string
src/daemon/TreelandConnector.cpp

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey there - I've reviewed your changes and they look great!

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `src/daemon/TreelandConnector.cpp:196` </location>
<code_context>
+        treeland_ddm_enable_render(m_ddm);
+        wl_display_flush(m_display);
+    } else {
+        qWarning("Treeland is not connected when trying to call enableRender");
+    }
+}
</code_context>

<issue_to_address>
Warning message could include context for easier debugging.

Consider adding relevant details, like session state or user info, to the warning to aid in diagnosing connection problems.

Suggested implementation:

```cpp
    } else {
        QString sessionState = getSessionState(); // Replace with actual session state retrieval
        QString userInfo = getCurrentUserInfo();  // Replace with actual user info retrieval
        qWarning("Treeland is not connected when trying to call enableRender. Session state: %s, User info: %s",
                 qPrintable(sessionState), qPrintable(userInfo));
    }
}

```

You will need to implement or use existing functions for `getSessionState()` and `getCurrentUserInfo()` to retrieve the session state and user information. If these functions do not exist, you should add them or replace them with the appropriate code to fetch the required context.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Since switching VT will not drop DRM FD, treeland still able to draw to
DRM after VT switched, which will cause wrong display render when
switching VT too quickly. This commit use new treeland-ddm-v1 protocol
to disable treeland global rendering before VT switching, and enable it
after switching complete, thus the issue will be fixed.
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: apr3vau, zccrs

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@zccrs zccrs merged commit b7391d7 into linuxdeepin:master Aug 21, 2025
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants