From ef8d2d0d6e76bbd9617cf3c838cedd79c2846fce Mon Sep 17 00:00:00 2001 From: ezdiy Date: Fri, 25 Sep 2020 13:20:02 +0200 Subject: [PATCH] linuxfb: is_always_portrait must be passed to screen init() from all frontends. (#6712) This is because fb driver should not be inspecting self.device for low level caps anymore. Fixes #6711 --- frontend/device/cervantes/device.lua | 2 +- frontend/device/kobo/device.lua | 2 +- frontend/device/sdl/device.lua | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/device/cervantes/device.lua b/frontend/device/cervantes/device.lua index 1b3ce819c..78ffca399 100644 --- a/frontend/device/cervantes/device.lua +++ b/frontend/device/cervantes/device.lua @@ -157,7 +157,7 @@ function Cervantes:initEventAdjustHooks() end function Cervantes:init() - self.screen = require("ffi/framebuffer_mxcfb"):new{device = self, debug = logger.dbg} + self.screen = require("ffi/framebuffer_mxcfb"):new{device = self, debug = logger.dbg, is_always_portrait = self.isAlwaysPortrait()} -- Automagically set this so we never have to remember to do it manually ;p if self:hasNaturalLight() and self.frontlight_settings and self.frontlight_settings.frontlight_mixer then diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua index eb5296d37..c6cb7e69a 100644 --- a/frontend/device/kobo/device.lua +++ b/frontend/device/kobo/device.lua @@ -291,7 +291,7 @@ probeEvEpochTime = function(self, ev) end function Kobo:init() - self.screen = require("ffi/framebuffer_mxcfb"):new{device = self, debug = logger.dbg} + self.screen = require("ffi/framebuffer_mxcfb"):new{device = self, debug = logger.dbg, is_always_portrait = self.isAlwaysPortrait()} if self.screen.fb_bpp == 32 then -- Ensure we decode images properly, as our framebuffer is BGRA... logger.info("Enabling Kobo @ 32bpp BGR tweaks") diff --git a/frontend/device/sdl/device.lua b/frontend/device/sdl/device.lua index dd45ffc41..9b4d25cf2 100644 --- a/frontend/device/sdl/device.lua +++ b/frontend/device/sdl/device.lua @@ -152,6 +152,7 @@ function Device:init() h = self.window.height, x = self.window.left, y = self.window.top, + is_always_portrait = self.isAlwaysPortrait(), } self.powerd = require("device/sdl/powerd"):new{device = self}