Commit 5c3e0325 authored by Méven Car's avatar Méven Car
Browse files

DrmOutput: Ensure waylandOutput dpms mode matches DrmOutputs

After 797ccca4
It appeard WaylandOutput (OutputInterface) would never get their Dpms
mode.
parent 797ccca4
...@@ -579,6 +579,7 @@ void DrmOutput::updateDpms(KWaylandServer::OutputInterface::DpmsMode mode) ...@@ -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() ...@@ -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()) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment