Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • xserver xserver
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 922
    • Issues 922
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 130
    • Merge requests 130
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • xorgxorg
  • xserverxserver
  • Merge requests
  • !739

modesetting: Fix VRR window property handling.

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Mario Kleiner requested to merge kleinerm/xserver:modesettingvrrfix into master Aug 27, 2021
  • Overview 2
  • Commits 1
  • Pipelines 2
  • Changes 1

A misplaced error check can cause this failure scenario, and does so reliably as tested on Ubuntu 21.04 with KDE Plasma 5 desktop within the first few seconds of login session startup, rendering VRR under modesetting-ddx unusable:

  1. Some X11 client application changes some window property.

  2. ms_change_property() is called as part of the property change handling call chain (client->requestVector[X_ChangeProperty]). It removes itself temporarily from the call chain - or so it thinks, hooking up saved_change_property instead.

  3. ret = saved_change_property(client) is called and fails temporarily for some non-critical reason.

  4. The misplaced error check returns early (error abort), without first restoring ms_change_property() as initial X_ChangeProperty handler in the call chain again.

-> Now ms_change_property() has removed itself permanently from the property handler call chain for the remainder of the X session and VRR property changes on windows are no longer handled, ie. VRR no longer gets enabled/disabled in response to window VRR property changes.

Place the error check at the proper place, just as it is correctly done by amdgpu-ddx, and in modesetting-ddx ms_delete_property() function.

Verified to fix VRR handling with an AMD gpu under KDE desktop session.

Please consider merging before branching the server 1.21 branch.

Signed-off-by: Mario Kleiner mario.kleiner.de@gmail.com

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: modesettingvrrfix