Skip to content

drm: make pageflips drive the frames #241

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

Merged
vaxerski merged 1 commit into from
Feb 15, 2026
Merged

drm: make pageflips drive the frames #241

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions include/aquamarine/backend/DRM.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ namespace Aquamarine {
bool isPageFlipPending = false;
SDRMPageFlip pendingPageFlip;
bool frameEventScheduled = false;
bool isFrameRunning = false;

// the current state is invalid and won't commit, don't try to modeset.
bool commitTainted = false;
Expand Down
11 changes: 8 additions & 3 deletions src/backend/drm/DRM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,9 @@ static void handlePF(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, un
return;
}

if (BACKEND->sessionActive() && pageFlip->connector->output->enabledState)
pageFlip->connector->isFrameRunning = true;

pageFlip->connector->onPresent();

uint32_t flags = IOutput::AQ_OUTPUT_PRESENT_VSYNC | IOutput::AQ_OUTPUT_PRESENT_HW_CLOCK | IOutput::AQ_OUTPUT_PRESENT_HW_COMPLETION | IOutput::AQ_OUTPUT_PRESENT_ZEROCOPY;
Expand All @@ -1013,8 +1016,10 @@ static void handlePF(int fd, unsigned seq, unsigned tv_sec, unsigned tv_usec, un
.flags = flags,
});

if (BACKEND->sessionActive() && !pageFlip->connector->frameEventScheduled && pageFlip->connector->output->enabledState)
if (BACKEND->sessionActive() && pageFlip->connector->output->enabledState) {
pageFlip->connector->output->events.frame.emit();
pageFlip->connector->isFrameRunning = false;
}
}

bool Aquamarine::CDRMBackend::dispatchEvents() {
Expand Down Expand Up @@ -2051,7 +2056,7 @@ void Aquamarine::CDRMOutput::scheduleFrame(const scheduleFrameReason reason) {
connector->isPageFlipPending, connector->frameEventScheduled)));
needsFrame = true;

if (connector->isPageFlipPending || connector->frameEventScheduled || !enabledState)
if (connector->isPageFlipPending || connector->isFrameRunning || connector->frameEventScheduled || !enabledState)
return;

connector->frameEventScheduled = true;
Expand Down Expand Up @@ -2111,7 +2116,7 @@ Aquamarine::CDRMOutput::CDRMOutput(const std::string& name_, Hyprutils::Memory::

frameIdle = makeShared<std::function<void(void)>>([this]() {
connector->frameEventScheduled = false;
if (connector->isPageFlipPending)
if (connector->isPageFlipPending || connector->isFrameRunning)
return;
events.frame.emit();
});
Expand Down