On 8/17/22 10:05 AM, Hans de Goede wrote:
Hi Daniel,
On 8/2/22 18:49, Daniel Dadap wrote:
On 8/2/22 06:31, Hans de Goede wrote:
Hi Daniel,
On 7/21/22 23:30, Daniel Dadap wrote:
On 7/21/22 16:24, Daniel Dadap wrote:
On 7/12/22 14:38, Hans de Goede wrote:
ATM on x86 laptops where we want userspace to use the acpi_video backlight
device we often register both the GPU's native backlight device and
acpi_video's firmware acpi_video# backlight device. This relies on
userspace preferring firmware type backlight devices over native ones, but
registering 2 backlight devices for a single display really is undesirable.
On x86 laptops where the native GPU backlight device should be used,
the registering of other backlight devices is avoided by their drivers
using acpi_video_get_backlight_type() and only registering their backlight
if the return value matches their type.
acpi_video_get_backlight_type() uses
backlight_device_get_by_type(BACKLIGHT_RAW) to determine if a native
driver is available and will never return native if this returns
false. This means that the GPU's native backlight registering code
cannot just call acpi_video_get_backlight_type() to determine if it
should register its backlight, since acpi_video_get_backlight_type() will
never return native until the native backlight has already registered.
To fix this add a new internal native function parameter to
acpi_video_get_backlight_type(), which when set to true will make
acpi_video_get_backlight_type() behave as if a native backlight has
already been registered.
And add a new acpi_video_backlight_use_native() helper, which sets this
to true, for use in native GPU backlight code.
Changes in v2:
- Replace adding a native parameter to acpi_video_get_backlight_type() with
adding a new acpi_video_backlight_use_native() helper.
Signed-off-by: Hans de Goede <hdego...@redhat.com>
---
drivers/acpi/video_detect.c | 24 ++++++++++++++++++++----
include/acpi/video.h | 5 +++++
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index becc198e4c22..4346c990022d 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -17,8 +17,9 @@
* Otherwise vendor specific drivers like thinkpad_acpi, asus-laptop,
* sony_acpi,... can take care about backlight brightness.
*
- * Backlight drivers can use acpi_video_get_backlight_type() to determine
- * which driver should handle the backlight.
+ * Backlight drivers can use acpi_video_get_backlight_type() to determine which
+ * driver should handle the backlight. RAW/GPU-driver backlight drivers must
+ * use the acpi_video_backlight_use_native() helper for this.
*
* If CONFIG_ACPI_VIDEO is neither set as "compiled in" (y) nor as a module
(m)
* this file will not be compiled and acpi_video_get_backlight_type() will
@@ -548,9 +549,10 @@ static int acpi_video_backlight_notify(struct
notifier_block *nb,
* Arguably the native on win8 check should be done first, but that would
* be a behavior change, which may causes issues.
*/
-enum acpi_backlight_type acpi_video_get_backlight_type(void)
+static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native)
{
static DEFINE_MUTEX(init_mutex);
+ static bool native_available;
static bool init_done;
static long video_caps;
@@ -570,6 +572,8 @@ enum acpi_backlight_type
acpi_video_get_backlight_type(void)
backlight_notifier_registered = true;
init_done = true;
}
+ if (native)
+ native_available = true;
mutex_unlock(&init_mutex);
if (acpi_backlight_cmdline != acpi_backlight_undef)
@@ -581,13 +585,25 @@ enum acpi_backlight_type
acpi_video_get_backlight_type(void)
if (!(video_caps & ACPI_VIDEO_BACKLIGHT))
return acpi_backlight_vendor;
- if (acpi_osi_is_win8() && backlight_device_get_by_type(BACKLIGHT_RAW))
+ if (acpi_osi_is_win8() &&
+ (native_available || backlight_device_get_by_type(BACKLIGHT_RAW)))
return acpi_backlight_native;
return acpi_backlight_video;
So I ran into a minor problem when testing the NVIDIA proprietary driver
against this change set, after checking acpi_video_backlight_use_native()
before registering the NVIDIA proprietary driver's backlight handler. Namely,
for the case where a user installs the NVIDIA proprietary driver after the
video.ko has already registered its backlight handler, we end up with both the
firmware and native handlers registered simultaneously, since the ACPI video
driver no longer unregisters its backlight handler. In this state, desktop
environments end up preferring the registered but non-functional firmware
handler from video.ko. (Manually twiddling the sysfs interface for the native
NVIDIA handler works fine.) When rebooting the system after installing the
NVIDIA proprietary driver, it is able to register its native handler before the
delayed work to register the ACPI video backlight handler fires, so we end up
with only one (native) handler, and userspace is happy.
Maybe this will be moot later on, when the existing sysfs interface is
deprecated, and it probably isn't a huge deal, since a reboot fixes things (I
imagine installing an in-tree DRM/KMS driver on an already running kernel isn't
really a thing, which is why this isn't a problem with the in-tree drivers),
but would it make sense to unregister the ACPI video backlight handler here
before returning acpi_backlight_native? That way, we'll briefly end up with
zero backlight handlers rather than briefly ending up with two of them. Not
sure if that's really any better, though.
Thinking about this a little more, maybe it's better not to overly complicate
things, and just assert that users of the NVIDIA proprietary driver will need
to reboot after installation in order to get the backlight working, at least
until we get further along in this effort and the backlight interface
transitions to the DRM connector property you have proposed.
Right, this series stops unregistering the acpi_video# /sys/class/backlight
devices because the idea is to never register them in the first place.
Registering them in the first place causes 2 problems:
1. It causes userspace to see udev events for the register + unregister
and by the time the systemd backlight level save/restore helper runs
from udev the unregister has already happened and it logs ugly errors.
More in general this kinda racy behavior just is ugly.
2. On some hw merely registering the backlight device, which I think
at least tries to retrieve the current level through ACPI, is causing
issues. So now we have DMI quirks to force the native backlight on
some devices, even though the heuristics also say native eventually,
just to avoid the race. Avoiding the add + remove dance allows
us to drop a bunch of quirks and likely also fixes issues on other
devices which we don't yet know need the quirk.
Yes, those sound like good reasons to avoid registering the ACPI video
backlight driver wherever possible.
So this patch-set changes the acpi_video.c code to no longer register
the acpi_video# backlight devices at init time *at all*. Instead native
drivers are supposed to now call acpi_video_register_backlight()
when they have found an internal panel. But to avoid this causing
the acpi_video# backlight devices to not show up at all in some
cases (e.g. native kms drivers blacklisted) the acpi_video code
also calls acpi_video_register_backlight() itself after 8 seconds.
I believe this is what you are hitting, the 8 seconds have passed
before the nvidia driver calls acpi_video_backlight_use_native(),
so the acpi_video# backlight devices have registered (and no longer
go away).
This is not only a problem when installing the nvidia binary driver
for the first time. It can also be a problem if the binary driver
is not in the initrd and leaving the initrd takes longer then
8 seconds, say because of a diskcrypt password. So I believe that
this really can be a problem with the nvidia binary driver.
Hmm. I hadn't considered the case of the binary driver being absent from the initrd, and
the possibility of the transition out of the initrd happening after the timeout. Yes,
this is a bigger problem than the "only after first installing the driver"
scenario I ran into.
But I think this is easy to fix. We could make the 8 second
delay configurable by replacing the ACPI_VIDEO_REGISTER_BACKLIGHT_DELAY
define with a module-parameter; and we could make "0" as value mean
that acpi_video.c will never call acpi_video_register_backlight()
itself.
Since the various (also counting distor packaging) nvidia binary
driver installers already all modify the kernel commandline to
blacklist nouveau, then the installers can just also pass this
parameter and then acpi_video.c will never register the acpi_video#.
This sounds like a reasonable compromise, but I worry that it may be difficult
to determine whether a system definitely doesn't need the ACPI video backlight
driver. On the other hand, the last system that I recall personally seeing that
did use the ACPI video backlight driver was a little over 10 years ago, so it's
possible that there are no systems which use that driver which are supported by
current versions of the NVIDIA proprietary driver. I'll have to do some
research to determine what types of systems actually used video.ko's backlight
driver, unless you happen to know already.
Generally the backlight control method / fw interface to use depends
on the Era of the laptop:
1. pre Windows XP Era laptops use vendor specific ACPI or SMBIOS interfaces
such as those dealt with by dell-laptop, thinkpad-acpi, etc.
2. Windows XP Era (which ends with Win 8/Vista) laptops used the ACPI video
bus backlight interface
3. Win 8/Vista and later Era laptops use the GPU driver's native backlight
support instead of some firmware interface
This is generalizing things a bit. E.g. esp during the transition between
the Eras often both Era methods (e.g vendor + acpi-video) would work
equally well.
So wrt your questions, generally speaking any laptops which were
designed for Win8/Vista or newer no longer use the ACPI video
interface.
So yes it is possible that there are no systems supported by
the latest NVIDIA proprietary driver which need ACPI video at
all. OTOH on dual-GPU setups with muxes it is not unreasonable
for ACPI video to actually be the driver which needs to be
used in case e.g. the backlight control is hooked up to the
EC so that it does not need to go through the mux. Basically
ACPI video Should work well (if the ACPI tables are written
properly) in setups where the EC drivers the backlight and
where this the GPU driver cannot control it directly. So
their might very well be pre nvidia-wmi-ec-backlight laptops
which use ACPI video to control the brightness through the EC.
Thanks. My understanding is that EC-driven backlight on muxed systems is
always controlled by the interface that the nvidia-wmi-ec-backlight
driver uses, but that could be true only for newer designs with NVIDIA
discrete GPUs. On older designs the mux was not intended to be switched
while a GPU was actively driving the display, so it seems unlikely, but
not impossible, that such designs would have seen a need to control the
backlight brightness via something other than one of the GPUs.
This does mean that the nvidia binary driver then must call
acpi_video_register_backlight() when an internal panel is found.
Note the current patches to amdgpu/nouveau skip the calling of
acpi_video_register_backlight() when
the acpi_video_backlight_use_native() call returns true and they
have registered their own backlight. But calling it always is ok
*as long as the driver is driving the laptops internal panel* !
acpi_video_register_backlight() contains:
if (acpi_video_get_backlight_type() != acpi_backlight_video)
return 0;
So calling it when a native backlight has already been registered
is a no-op.
The NVIDIA proprietary driver will already know when it has registered its own
backlight handler, so there probably isn't any need to always call it when
driving an internal panel.
Ok.
I'll have to double-check to see if we have already determined whether a panel
is connected before registering the backlight handler: I am pretty certain that
is the case.
Yeah registering a backlight handler when there is no internal panel would be
weird.
One further potential difficulty that I anticipate is that not all dynamic mux
systems use the EC backlight driver (or a similar, GPU-agnostic driver), and
rather have whichever GPU happens to be connected at the time be responsible
for the backlight. I had initially thought that supporting the EC backlight
interface was a requirement for OEMs to implement dynamic mux support, but I
recently learned this is not true in all cases. On Windows, this requires
coordinating the backlight controls of the two GPU drivers across a mux switch,
to load the state of the switched-away-from GPU and set it on the switched-to
GPU. I imagine for these systems we may need to do some similar save/restore,
probably managed by vga-switcheroo, but it would require having both GPU
drivers register their own native backlight handlers (and possibly while one of
them is not connected to the panel).
Right, systems where the backlight control basically gets muxed from one GPU to
the other GPU together with the panel's video-data lines exist. Currently Linux
already register both native GPU backlight handlers in this case. e.g.
/sys/class/backlight/intel_backlight and /sys/class/backlight/nouveau_bl.
Userspace (atleast GNOME) has code which checks which GPU is actually connected
to the panel using the panel's drm connector's status on each GPU (only one of
which should report connected) and then uses the backlight interface associated
with the connected connector.
Dynamic mux switching isn't actually supported on Linux, yet, so we should be able to
kick this particular can a little further down the road, but in the meantime we should
probably start planning for how best to handle this sort of system under the "only
one backlight handler per panel" model. Maybe the vga-switcheroo handler can
register its own backlight handler, that then negotiates the actual backlight settings
between the relevant GPU drivers, possibly through a new vga-switcheroo client callback.
I'll have to think about this a bit more.
The "only one backlight handler per panel" model is actualy "only one backlight
handler per panel"-connector since the new API uses drm properties on the drm connector
object. With 2 GPUs both using their native backlight control there will be 2 connectors and
userspace will/must use the one which is actually reporting that it is connected to the panel so
this will work fine.
That is a useful distinction. Would it fall under userspace's
reponsibility, then, to keep the brightness level synchronized across
drm_connectors that share a panel via a mux when performing a switch? I
suppose it's a cleaner design to leave it up to userspace to select
which backlight interface to manipulate. That is a harder decision for
userspace to make with the existing design, which doesn't cleanly map
sysfs backlight interfaces to individual connectors, but if the UAPI is
going to change to a drm_connector property, backlight interfaces are
obviously strongly correlated with the connectors. I'm not sure how easy
it is for userspace to solve the problem of maintaining consistent
brightness levels across a mux switch for an OLED panel, where there
really isn't a concept of a "backlight" to speak of, but I suppose it
wouldn't be any easier to do that in the kernel (e.g. with vga-switcheroo).
If anything the nvidia-wmi-ec-backlight case is a but more tricky, the "only one backlight
handler per panel" thing is actually more of a "only one backlight handler per
laptop" rule which is intended for (to be written) drm helpers for the new properties to be
able to get the handler from the backlight class in the non native case by just taking the first
registered backlight handler.
This means that in a dual GPU setup with nvidia-wmi-ec-backlight both GPU's
panel connector objects will have their brightness properties pointing to /
proxying the same backlight class device. Userspace should really be only
writing to the one which is actually connected though. I guess we could even
enforce this
in the kernel and reject brightness property writes on unconnected connectors.
Please let me know if the proposed solution works for you and
if you want me to make ACPI_VIDEO_REGISTER_BACKLIGHT_DELAY a
module-option for the next version.
I do think it should be workable, apart from the concern I mentioned above
about knowing when to set the module option to disable the ACPI video backlight
driver.
Note the option does not disable the ACPI video backlight driver. It disables
the acpi_video code timing out and deciding to go ahead and register its
backlight itself (providing that at the moment of timeout
acpi_video_get_backlight_type() returns acpi_backlight_video). Any code (e.g.
the nvidia binary driver) can still call acpi_video_register_backlight() itself
to try and register even if the timeout handling has been disabled.
The idea is that without the timeout the probe order looks like this:
1. acpi_video initializes, does not register backlight
2. GPU driver initalizes, it either registers a native backlight handler;
or it calls acpi_video_register_backlight()
3. acpi_video_register_backlight() runs (if called) and calls:
acpi_video_get_backlight_type()
4.1 if acpi_video_get_backlight_type() returns acpi_backlight_video
/sys/class/backlight/acpi_video# is/are registered
4.2 if acpi_video_get_backlight_type() returns somerthing else, e.g.
acpi_backlight_nvidia_wmi_ec, acpi_video_register_backlight()
does nothing
The timeout is to ensure that 3. still happens, even if
there is no native GPU driver, because of e.g.
nomodeset on the kernel cmdline.
With the nvidia binary driver, that driver can call
acpi_video_register_backlight() if necessary so the timeout
is not necessary.
I'm currently preparing v3 of this patchset. I'll modify the
patch introducing the timeout to make it configurable
(with 0 disabling it completely).
Okay. That clarification makes sense. Would it be reasonable to disable
the timeout by default on systems with Win8 or later _OSI?
p.s.
I think that eventually I might even try to make the new
module-param default to 0 / default to not having acpi_video.c
do the registering itself ever and see how that goes...
Would the GPU drivers then be responsible for calling
acpi_video_register_backlight() again? My understanding was that part of the
intention here was to make that no longer necessary.
It is actually the other way around, before this patch-set
acpi_video_register_backlight() does not exist as a separate
step. Before this patch-set the registering is done at
acpi_video probe time. At acpi_video probe time it may be
unknown if a native GPU driver (which is preferred) might
become available later.
This patch-set actually makes the registration a separate
step, which must be called by the GPU driver driving the panel
when its own native backlight control probing is done
(and has not resulted in registering its own backlight handler).
IOW this patch-set is actually what makes it necessary for
the GPU drivers to call acpi_video_register_backlight()
(rather then making this no longer necessary).
Also see the probe order example I wrote above.
The timeout is really just a bandaid to not regress on systems
where for some reason there is no native GPU driver to do
the registration.
I hope this makes things a bit more clear.
Yes, thank you. It is much less confusing when I don't have my mental
model inside-out and backwards.
Regards,
Hans
}
+
+enum acpi_backlight_type acpi_video_get_backlight_type(void)
+{
+ return __acpi_video_get_backlight_type(false);
+}
EXPORT_SYMBOL(acpi_video_get_backlight_type);
+bool acpi_video_backlight_use_native(void)
+{
+ return __acpi_video_get_backlight_type(true) == acpi_backlight_native;
+}
+EXPORT_SYMBOL(acpi_video_backlight_use_native);
+
/*
* Set the preferred backlight interface type based on DMI info.
* This function allows DMI blacklists to be implemented by external
diff --git a/include/acpi/video.h b/include/acpi/video.h
index db8548ff03ce..4705e339c252 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -56,6 +56,7 @@ extern void acpi_video_unregister(void);
extern int acpi_video_get_edid(struct acpi_device *device, int type,
int device_id, void **edid);
extern enum acpi_backlight_type acpi_video_get_backlight_type(void);
+extern bool acpi_video_backlight_use_native(void);
extern void acpi_video_set_dmi_backlight_type(enum acpi_backlight_type
type);
/*
* Note: The value returned by acpi_video_handles_brightness_key_presses()
@@ -77,6 +78,10 @@ static inline enum acpi_backlight_type
acpi_video_get_backlight_type(void)
{
return acpi_backlight_vendor;
}
+static inline bool acpi_video_backlight_use_native(void)
+{
+ return true;
+}
static inline void acpi_video_set_dmi_backlight_type(enum
acpi_backlight_type type)
{
}
