Skip to content

DRMBackend: Carry pending mode to composite path when direct scanout fails #2135

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.

Sign up for GitHub

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

Open
nfraprado wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −0
Open

DRMBackend: Carry pending mode to composite path when direct scanout fails #2135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Backends/DRMBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3511,11 +3511,16 @@ namespace gamescope
bool bDoComposite = true;
if ( !bNeedsFullComposite && !bWantsPartialComposite )
{
// Save the pending mode so it can be restored after drm_rollback() and carried
// over to the composite path
std::shared_ptr<gamescope::BackendBlob> pPendingModeId = g_DRM.pending.mode_id;
int ret = drm_prepare( &g_DRM, bAsync, pFrameInfo );
if ( ret == 0 )
bDoComposite = false;
else if ( ret == -EACCES )
return 0;
else if ( g_DRM.needs_modeset )
g_DRM.pending.mode_id = pPendingModeId;
}

// Update to let the vblank manager know we are currently compositing.
Expand Down