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

platforms/drm: make failure of findWorkingCombination less severe

Browse source 
While findWorkingCombination should never fail, in the case it does
KWin should not crash. To achieve that simply restore the old config
in case of failure.

CCBUG: 439873
This commit is contained in:
Xaver Hugl 2021-09-27 18:18:31 +02:00 committed by Nate Graham
parent d7d1c6600a
commit de674e087a
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/plugins/platforms/drm/drm_gpu.cpp
View file

@ -280,10 +280,11 @@ bool DrmGpu::updateOutputs()
plane->updateProperties(); plane->updateProperties();
} }
// delete current pipelines of active outputs // stash away current pipelines of active outputs
QMap<DrmOutput*, DrmPipeline*> oldPipelines;
for (const auto &output : qAsConst(m_drmOutputs)) { for (const auto &output : qAsConst(m_drmOutputs)) {
m_pipelines.removeOne(output->pipeline()); m_pipelines.removeOne(output->pipeline());
delete output->pipeline(); oldPipelines.insert(output, output->pipeline());
output->setPipeline(nullptr); output->setPipeline(nullptr);
} }
@ -304,7 +305,18 @@ bool DrmGpu::updateOutputs()
planes.removeOne(output->pipeline()->primaryPlane()); planes.removeOne(output->pipeline()->primaryPlane());
} }
} }
const auto config = findWorkingCombination({}, connectors, crtcs, planes); auto config = findWorkingCombination({}, connectors, crtcs, planes);
if (config.isEmpty() && !connectors.isEmpty()) {
qCCritical(KWIN_DRM) << "DrmGpu::findWorkingCombination failed to find any functional combinations! Reverting to the old configuration!";
for (auto it = oldPipelines.begin(); it != oldPipelines.end(); it++) {
it.value()->setOutput(it.key());
config << it.value();
}
} else {
for (const auto &pipeline : qAsConst(oldPipelines)) {
delete pipeline;
}
}
m_pipelines << config; m_pipelines << config;
for (const auto &pipeline : config) { for (const auto &pipeline : config) {