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

Merge branch 'Plasma/5.17'

Browse source
This commit is contained in:
Roman Gilg 2019-10-22 11:29:03 +02:00
commit 929866b1a0
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/platforms/drm/drm_output.cpp
View file

@ -252,8 +252,6 @@ bool DrmOutput::init(drmModeConnector *connector)
if (!initPrimaryPlane()) { if (!initPrimaryPlane()) {
return false; return false;
} }
} else if (!m_crtc->blank()) {
return false;
} }
setInternal(connector->connector_type == DRM_MODE_CONNECTOR_LVDS || connector->connector_type == DRM_MODE_CONNECTOR_eDP setInternal(connector->connector_type == DRM_MODE_CONNECTOR_LVDS || connector->connector_type == DRM_MODE_CONNECTOR_eDP
@ -269,6 +267,12 @@ bool DrmOutput::init(drmModeConnector *connector)
} }
initOutputDevice(connector); initOutputDevice(connector);
if (!m_backend->atomicModeSetting() && !m_crtc->blank()) {
// We use legacy mode and the initial output blank failed.
return false;
}
updateDpms(KWayland::Server::OutputInterface::DpmsMode::On); updateDpms(KWayland::Server::OutputInterface::DpmsMode::On);
return true; return true;
} }
@ -746,8 +750,10 @@ void DrmOutput::setWaylandMode()
void DrmOutput::pageFlipped() void DrmOutput::pageFlipped()
{ {
Q_ASSERT(m_pageFlipPending); // In legacy mode we might get a page flip through a blank.
Q_ASSERT(m_pageFlipPending || !m_backend->atomicModeSetting());
m_pageFlipPending = false; m_pageFlipPending = false;
if (m_deleted) { if (m_deleted) {
deleteLater(); deleteLater();
return; return;