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

backends/drm: ensure pipeline mode is always in the connector mode list

Browse source 
The current mode of an output not being in its mode list can lead to crashes
This commit is contained in:
Xaver Hugl 2022-08-30 22:45:51 +02:00
parent a9d51ab2f3
commit e195d42916
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/backends/drm/drm_object_connector.cpp
View file

@ -321,10 +321,16 @@ bool DrmConnector::updateProperties()
m_modes.clear();
m_modes.append(m_driverModes);
m_modes.append(generateCommonModes());
if (!m_pipeline->mode()) {
if (m_pipeline->mode()) {
if (const auto mode = findMode(*m_pipeline->mode()->nativeMode())) {
m_pipeline->setMode(mode);
} else {
m_pipeline->setMode(m_modes.constFirst());
}
} else {
m_pipeline->setMode(m_modes.constFirst());
m_pipeline->applyPendingChanges();
}
m_pipeline->applyPendingChanges();
if (m_pipeline->output()) {
m_pipeline->output()->updateModes();
}