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

DrmOutput: Ensure waylandOutput dpms mode matches DrmOutputs

Browse source 
After 797ccca48c
It appeard WaylandOutput (OutputInterface) would never get their Dpms
mode.
This commit is contained in:
Méven Car 2020-05-27 10:07:36 +02:00
parent 797ccca48c
commit 5c3e03259a
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,6 +579,7 @@ void DrmOutput::updateDpms(KWaylandServer::OutputInterface::DpmsMode mode)
if (drmMode == m_dpmsModePending) { if (drmMode == m_dpmsModePending) {
qCDebug(KWIN_DRM) << "New DPMS mode equals old mode. DPMS unchanged."; qCDebug(KWIN_DRM) << "New DPMS mode equals old mode. DPMS unchanged.";
waylandOutput()->setDpmsMode(mode);
return; return;
} }
@ -607,10 +608,7 @@ void DrmOutput::dpmsFinishOn()
{ {
qCDebug(KWIN_DRM) << "DPMS mode set for output" << m_crtc->id() << "to On."; qCDebug(KWIN_DRM) << "DPMS mode set for output" << m_crtc->id() << "to On.";
auto wlOutput = waylandOutput(); waylandOutput()->setDpmsMode(toWaylandDpmsMode(DpmsMode::On));
if (wlOutput) {
wlOutput->setDpmsMode(toWaylandDpmsMode(DpmsMode::On));
}
m_backend->checkOutputsAreOn(); m_backend->checkOutputsAreOn();
if (!m_backend->atomicModeSetting()) { if (!m_backend->atomicModeSetting()) {