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

platforms/drm: remove dangling pointer of lease outputs pipeline

Browse source
This commit is contained in:
Xaver Hugl 2021-09-30 00:52:38 +02:00
parent 66badd905b
commit bcbba62c7c
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -304,6 +304,8 @@ bool DrmGpu::updateOutputs()
connectors.removeOne(output->pipeline()->connector()); connectors.removeOne(output->pipeline()->connector());
crtcs.removeOne(output->pipeline()->crtc()); crtcs.removeOne(output->pipeline()->crtc());
planes.removeOne(output->pipeline()->primaryPlane()); planes.removeOne(output->pipeline()->primaryPlane());
} else {
m_pipelines.removeOne(output->pipeline());
} }
} }
auto config = findWorkingCombination({}, connectors, crtcs, planes); auto config = findWorkingCombination({}, connectors, crtcs, planes);
@ -313,6 +315,11 @@ bool DrmGpu::updateOutputs()
it.value()->setOutput(it.key()); it.value()->setOutput(it.key());
config << it.value(); config << it.value();
} }
for (const auto &leaseOutput : qAsConst(m_leaseOutputs)) {
if (!leaseOutput->lease()) {
config << leaseOutput->pipeline();
}
}
} else { } else {
for (const auto &pipeline : qAsConst(oldPipelines)) { for (const auto &pipeline : qAsConst(oldPipelines)) {
delete pipeline; delete pipeline;