forked from pool/systemd
88094f2bbb
- Add patch log-target-null-instead-kmsg.patch from Thomas Blume to enable the kernel developers to see a clean kmsg ring buffer without any systemd/udev messages included (bnc#877021) - Add upstram patches for backlight 0001-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch 0002-backlight-do-nothing-if-max_brightness-is-0.patch 0003-backlight-unify-error-messages.patch 0004-backlight-warn-if-kernel-exposes-backlight-device-wi.patch 0005-backlight-handle-saved-brightness-exceeding-max-brig.patch - Add upstream patches 0001-errno-make-sure-to-handle-the-3-errnos-that-are-alia.patch 0002-udev-warn-when-name_to_handle_at-is-not-implemented.patch 0003-analyze-fix-plot-with-bad-y-size.patch 0004-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch 0005-job-always-add-waiting-jobs-to-run-queue-during-cold.patch - Drop upstream-net_id-changes.patch and replace them with the correct patches from upstream and their commits: add: 1014-udev-update-net_id-comments.patch add: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch - Add patch log-target-null-instead-kmsg.patch from Thomas Blume to enable the kernel developers to see a clean kmsg ring buffer without any systemd/udev messages included (bnc#877021) - Add upstram patches for backlight 0001-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch 0002-backlight-do-nothing-if-max_brightness-is-0.patch OBS-URL: https://build.opensuse.org/request/show/233680 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=186
80 lines
3.0 KiB
Diff
80 lines
3.0 KiB
Diff
From 7b909d7407965c03caaba30daae7aee113627a83 Mon Sep 17 00:00:00 2001
|
|
From: Josh Triplett <josh@joshtriplett.org>
|
|
Date: Tue, 11 Mar 2014 21:16:33 -0700
|
|
Subject: [PATCH] backlight: Avoid restoring brightness to an unreadably dim
|
|
level
|
|
|
|
Some systems turn the backlight all the way off at the lowest levels.
|
|
Clamp saved brightness to at least 1 or 5% of max_brightness. This
|
|
avoids preserving an unreadably dim screen, which would otherwise force
|
|
the user to disable state restoration.
|
|
---
|
|
src/backlight/backlight.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 44 insertions(+)
|
|
|
|
diff --git src/backlight/backlight.c src/backlight/backlight.c
|
|
index 81470b3..abf8bcf 100644
|
|
--- src/backlight/backlight.c
|
|
+++ src/backlight/backlight.c
|
|
@@ -192,6 +192,48 @@ static bool validate_device(struct udev *udev, struct udev_device *device) {
|
|
return true;
|
|
}
|
|
|
|
+/* Some systems turn the backlight all the way off at the lowest levels.
|
|
+ * clamp_brightness clamps the saved brightness to at least 1 or 5% of
|
|
+ * max_brightness. This avoids preserving an unreadably dim screen, which
|
|
+ * would otherwise force the user to disable state restoration. */
|
|
+static void clamp_brightness(struct udev_device *device, char **value) {
|
|
+ int r;
|
|
+ const char *max_brightness_str;
|
|
+ unsigned brightness, max_brightness, new_brightness;
|
|
+
|
|
+ max_brightness_str = udev_device_get_sysattr_value(device, "max_brightness");
|
|
+ if (!max_brightness_str) {
|
|
+ log_warning("Failed to read max_brightness attribute; not checking saved brightness");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ r = safe_atou(*value, &brightness);
|
|
+ if (r < 0) {
|
|
+ log_warning("Failed to parse brightness \"%s\": %s", *value, strerror(-r));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ r = safe_atou(max_brightness_str, &max_brightness);
|
|
+ if (r < 0) {
|
|
+ log_warning("Failed to parse max_brightness \"%s\": %s", max_brightness_str, strerror(-r));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ new_brightness = MAX3(brightness, 1U, max_brightness/20);
|
|
+ if (new_brightness != brightness) {
|
|
+ char *old_value = *value;
|
|
+
|
|
+ r = asprintf(value, "%u", new_brightness);
|
|
+ if (r < 0) {
|
|
+ log_oom();
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ log_debug("Saved brightness %s too low; increasing to %s.", old_value, *value);
|
|
+ free(old_value);
|
|
+ }
|
|
+}
|
|
+
|
|
int main(int argc, char *argv[]) {
|
|
_cleanup_udev_unref_ struct udev *udev = NULL;
|
|
_cleanup_udev_device_unref_ struct udev_device *device = NULL;
|
|
@@ -306,6 +348,8 @@ int main(int argc, char *argv[]) {
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
+ clamp_brightness(device, &value);
|
|
+
|
|
r = udev_device_set_sysattr_value(device, "brightness", value);
|
|
if (r < 0) {
|
|
log_error("Failed to write system attribute: %s", strerror(-r));
|
|
--
|
|
1.7.9.2
|
|
|