From 83fe158a1637083482435fc3c15f9a988cf59e11 Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Wed, 7 Feb 2024 20:38:21 +0100
Subject: [PATCH] backends/drm: fix night light updates after dpms

BUG: 480911
FIXED-IN: 6.0
---
 src/backends/drm/drm_output.cpp | 1 +
 src/colors/colordevice.cpp      | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp
index 38830567ea..2b1b45cf8d 100644
--- a/src/backends/drm/drm_output.cpp
+++ b/src/backends/drm/drm_output.cpp
@@ -195,6 +195,7 @@ bool DrmOutput::setDrmDpmsMode(DpmsMode mode)
         if (active) {
             m_renderLoop->uninhibit();
             m_renderLoop->scheduleRepaint();
+            doSetChannelFactors(m_channelFactors);
         } else {
             m_renderLoop->inhibit();
         }
diff --git a/src/colors/colordevice.cpp b/src/colors/colordevice.cpp
index b73e9c9660..600dce997d 100644
--- a/src/colors/colordevice.cpp
+++ b/src/colors/colordevice.cpp
@@ -75,11 +75,6 @@ ColorDevice::ColorDevice(Output *output, QObject *parent)
     d->updateTimer = new QTimer(this);
     d->updateTimer->setSingleShot(true);
     connect(d->updateTimer, &QTimer::timeout, this, &ColorDevice::update);
-    connect(output, &Output::dpmsModeChanged, this, [this, output]() {
-        if (output->dpmsMode() == Output::DpmsMode::On) {
-            update();
-        }
-    });
 
     d->output = output;
     scheduleUpdate();