From abc86323fc0e1396b6402ebb38b8a78e21c44e3e Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Thu, 26 Sep 2019 23:59:31 +0200
Subject: [PATCH] [Kobo/Cervantes] Always use setBrightness to set the
 brightness (#5429)

sysfs_light handles every case sanely already, no need to be cute ;).

This prevents always setting the warmth when setting the FL on NL
devices with a mixer, because, besides being useless, it's also slow
(lua does mmap'ed io, so every handle requires an fstat + mmap).

It was subtly affecting the fluidity of the toggle ramp, and much less
subtly wreaking havoc on #5373 ;).

KA1 owners might want to investigate keeping the fds around one way or
another, like we do for the fl ioctl, to alleviate the overhead of doing
that for not one but three or four fds...
I won't be doing that, since I lack the hardware to test it, and FL+NL
stuff is pain.

* Do the same on Cervantes

* Bump base to pickup related ioctl tweaks
---
 base                                 | 2 +-
 frontend/device/cervantes/powerd.lua | 6 +-----
 frontend/device/kobo/powerd.lua      | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/base b/base
index feac06d12..96b4291d6 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit feac06d12bcf49dca180e650e1c811a50950ee9a
+Subproject commit 96b4291d630f591d5ab271542cd5b43a3fb568d9
diff --git a/frontend/device/cervantes/powerd.lua b/frontend/device/cervantes/powerd.lua
index 9763415ab..22b8541ec 100644
--- a/frontend/device/cervantes/powerd.lua
+++ b/frontend/device/cervantes/powerd.lua
@@ -131,11 +131,7 @@ end
 
 function CervantesPowerD:setIntensityHW(intensity)
     if self.fl == nil then return end
-    if self.fl_warmth == nil then
-        self.fl:setBrightness(intensity)
-    else
-        self.fl:setNaturalBrightness(intensity, self.fl_warmth)
-    end
+    self.fl:setBrightness(intensity)
     self.hw_intensity = intensity
     -- Now that we have set intensity, we need to let BasePowerD
     -- know about possibly changed frontlight state (if we came
diff --git a/frontend/device/kobo/powerd.lua b/frontend/device/kobo/powerd.lua
index 95370e904..b9adeb90e 100644
--- a/frontend/device/kobo/powerd.lua
+++ b/frontend/device/kobo/powerd.lua
@@ -232,11 +232,7 @@ end
 
 function KoboPowerD:setIntensityHW(intensity)
     if self.fl == nil then return end
-    if self.fl_warmth == nil then
-        self.fl:setBrightness(intensity)
-    else
-        self.fl:setNaturalBrightness(intensity, self.fl_warmth)
-    end
+    self.fl:setBrightness(intensity)
     self.hw_intensity = intensity
     -- Now that we have set intensity, we need to let BasePowerD
     -- know about possibly changed frontlight state (if we came