yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

platforms/drm: fix disabled outputs with legacy drivers

Browse source 
m_primaryBuffer could be nullptr when a pipeline was inactive before, causing
a crash
This commit is contained in:
Xaver Hugl 2021-10-18 22:03:16 +02:00
parent 3ec6dab5d0
commit 1763139834
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/plugins/platforms/drm/drm_pipeline.cpp
View file

@ -170,7 +170,7 @@ bool DrmPipeline::commitPipelines(const QVector<DrmPipeline*> &pipelines, Commit
return true;
} else {
for (const auto &pipeline : pipelines) {
if (pipeline->m_legacyNeedsModeset && !pipeline->modeset(0)) {
if (pipeline->m_legacyNeedsModeset && pipeline->isActive() && !pipeline->modeset(0)) {
return false;
}
}
@ -270,9 +270,6 @@ bool DrmPipeline::checkTestBuffer()
if (m_primaryBuffer && m_primaryBuffer->size() == sourceSize()) {
return true;
}
if (!isActive()) {
return true;
}
auto backend = m_gpu->eglBackend();
QSharedPointer<DrmBuffer> buffer;
// try to re-use buffers if possible.
@ -352,7 +349,10 @@ bool DrmPipeline::setActive(bool active)
success = atomicCommit();
}
} else {
success = m_connector->getProp(DrmConnector::PropertyIndex::Dpms)->setPropertyLegacy(active ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF);
success = modeset(m_connector->currentModeIndex());
if (success) {
success = m_connector->getProp(DrmConnector::PropertyIndex::Dpms)->setPropertyLegacy(active ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF);
}
}
if (!success) {
qCWarning(KWIN_DRM) << "Setting active to" << active << "failed" << strerror(errno);