hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-25 19:09:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

dont crash on multigpu lol

Browse source
This commit is contained in:
Vaxry 2024-07-06 18:11:31 +02:00
parent 187abbbcfd
commit 78498c8987
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/helpers/Monitor.cpp
View file

@ -31,8 +31,8 @@ CMonitor::~CMonitor() {
void CMonitor::onConnect(bool noRule) { void CMonitor::onConnect(bool noRule) {
if (output->supportsExplicit) { if (output->supportsExplicit) {
inTimeline = CSyncTimeline::create(g_pCompositor->m_iDRMFD); inTimeline = CSyncTimeline::create(output->getBackend()->drmFD());
outTimeline = CSyncTimeline::create(g_pCompositor->m_iDRMFD); outTimeline = CSyncTimeline::create(output->getBackend()->drmFD());
} }
listeners.frame = output->events.frame.registerListener([this](std::any d) { Events::listener_monitorFrame(this, nullptr); }); listeners.frame = output->events.frame.registerListener([this](std::any d) { Events::listener_monitorFrame(this, nullptr); });

5
src/helpers/sync/SyncTimeline.cpp
View file

@ -176,7 +176,10 @@ bool CSyncTimeline::importFromSyncFileFD(uint64_t dst, int fd) {
} }
bool CSyncTimeline::transfer(SP<CSyncTimeline> from, uint64_t fromPoint, uint64_t toPoint) { bool CSyncTimeline::transfer(SP<CSyncTimeline> from, uint64_t fromPoint, uint64_t toPoint) {
ASSERT(from->drmFD == drmFD); if (drmFD != from->drmFD) {
Debug::log(ERR, "CSyncTimeline::transfer: cannot transfer timelines between gpus");
return false;
}
if (drmSyncobjTransfer(drmFD, handle, toPoint, from->handle, fromPoint, 0)) { if (drmSyncobjTransfer(drmFD, handle, toPoint, from->handle, fromPoint, 0)) {
Debug::log(ERR, "CSyncTimeline::transfer: drmSyncobjTransfer failed"); Debug::log(ERR, "CSyncTimeline::transfer: drmSyncobjTransfer failed");