hyprwm/aquamarine
1
0
Fork 0
mirror of https://github.com/hyprwm/aquamarine.git synced 2025-12-20 02:30:02 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm: Avoid unnecessary modeset (fixed) (#184)

Browse source 
* feat: only do modeset when the mode is different from the current one

* style: remove braces around 1-line if

* fmt: run clang-format

* drm: add reset function back and remove reset from start

* drm: fix dpms on fastboot

* fmt: run clang-format

* Update Atomic.cpp
This commit is contained in:
Tiago Dinis 2025-07-07 15:19:52 +01:00 • committed by GitHub
parent dfc1db15a0
commit e2e3f8b4d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/backend/drm/DRM.cpp
View file

@ -895,7 +895,6 @@ void Aquamarine::CDRMBackend::scanLeases() {
} }
bool Aquamarine::CDRMBackend::start() { bool Aquamarine::CDRMBackend::start() {
impl->reset();
return true; return true;
} }

15
src/backend/drm/impl/Atomic.cpp
View file

@ -100,8 +100,19 @@ void Aquamarine::CDRMAtomicRequest::addConnector(Hyprutils::Memory::CSharedPoint
TRACE(backend->log(AQ_LOG_TRACE, std::format("atomic addConnector values: CRTC {}, mode {}", enable ? connector->crtc->id : 0, data.atomic.modeBlob))); TRACE(backend->log(AQ_LOG_TRACE, std::format("atomic addConnector values: CRTC {}, mode {}", enable ? connector->crtc->id : 0, data.atomic.modeBlob)));
conn = connector; conn = connector;
if (enable) {
drmModeModeInfo* currentMode = connector->getCurrentMode();
bool modeDiffers = true;
if (currentMode) {
modeDiffers = memcmp(currentMode, &data.modeInfo, sizeof(drmModeModeInfo)) != 0;
free(currentMode);
}
addConnectorModeset(connector, data); if (modeDiffers)
addConnectorModeset(connector, data);
} else
addConnectorModeset(connector, data);
addConnectorCursor(connector, data); addConnectorCursor(connector, data);
add(connector->id, connector->props.crtc_id, enable ? connector->crtc->id : 0); add(connector->id, connector->props.crtc_id, enable ? connector->crtc->id : 0);
@ -181,7 +192,7 @@ void Aquamarine::CDRMAtomicRequest::addConnectorModeset(Hyprutils::Memory::CShar
const auto& STATE = connector->output->state->state(); const auto& STATE = connector->output->state->state();
const bool enable = STATE.enabled && data.mainFB; const bool enable = STATE.enabled && data.mainFB;
add(connector->crtc->id, connector->crtc->props.mode_id, data.atomic.modeBlob); add(connector->crtc->id, connector->crtc->props.mode_id, enable ? data.atomic.modeBlob : 0);
data.atomic.blobbed = true; data.atomic.blobbed = true;
if (!enable) if (!enable)

10
tests/SimpleWindow.cpp
View file

@ -70,15 +70,13 @@ int main(int argc, char** argv, char** envp) {
}); });
newMouseListener = aqBackend->events.newPointer.listen([](const SP<Aquamarine::IPointer>& pointer) { newMouseListener = aqBackend->events.newPointer.listen([](const SP<Aquamarine::IPointer>& pointer) {
mouseMotionListener = pointer->events.warp.listen([](const Aquamarine::IPointer::SWarpEvent& event) { mouseMotionListener = pointer->events.warp.listen(
std::cout << "[Client] Mouse warped to " << std::format("{}", event.absolute) << "\n"; [](const Aquamarine::IPointer::SWarpEvent& event) { std::cout << "[Client] Mouse warped to " << std::format("{}", event.absolute) << "\n"; });
});
}); });
newKeyboardListener = aqBackend->events.newKeyboard.listen([](const SP<Aquamarine::IKeyboard>& keyboard) { newKeyboardListener = aqBackend->events.newKeyboard.listen([](const SP<Aquamarine::IKeyboard>& keyboard) {
keyboardKeyListener = keyboard->events.key.listen([](const Aquamarine::IKeyboard::SKeyEvent& event) { keyboardKeyListener = keyboard->events.key.listen(
std::cout << "[Client] Key " << std::format("{}", event.key) << " state: " << event.pressed << " \n"; [](const Aquamarine::IKeyboard::SKeyEvent& event) { std::cout << "[Client] Key " << std::format("{}", event.key) << " state: " << event.pressed << " \n"; });
});
}); });
if (!aqBackend || !aqBackend->start()) { if (!aqBackend || !aqBackend->start()) {