From 67e2939e24f5d5df3c87fb950c9063a48c448efc Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Thu, 30 Dec 2021 00:24:56 +0000 Subject: [PATCH] acpiout(4): Work around firmware that doesn't like some brightnesses. Instead of just asking for cur - 5 or cur + 5, repeatedly ask for that increment, check whether we actually made progress in that direction, and if not keep going with another increment, until we hit the bounds of brightness levels. I can't find anything in the ACPI spec about this, but my laptop seems to have trouble with certain levels: 15, 75, 85, 95. It goes in all other increments of 5 from 5 to 100, just not those ones -- acts as if they just don't exist. --- sys/dev/acpi/acpi_display.c | 56 ++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/sys/dev/acpi/acpi_display.c b/sys/dev/acpi/acpi_display.c index 2b76e6cf7db1..fd657a897d4b 100644 --- a/sys/dev/acpi/acpi_display.c +++ b/sys/dev/acpi/acpi_display.c @@ -1010,7 +1010,8 @@ acpidisp_out_increase_brightness_callback(void *arg) { struct acpidisp_out_softc *osc = arg; struct acpidisp_brctl *bc = osc->sc_brctl; - uint8_t lo, up; + uint8_t max, lo, up; + int cur; if (bc == NULL) { /* Fallback to pmf(9). */ @@ -1019,16 +1020,21 @@ acpidisp_out_increase_brightness_callback(void *arg) } mutex_enter(osc->sc_mtx); - - (void)acpidisp_get_brightness(osc, &bc->bc_current); - - acpidisp_array_search(bc->bc_level, bc->bc_level_count, - bc->bc_current + ACPI_DISP_BRCTL_STEP, &lo, &up); - - bc->bc_current = up; - (void)acpidisp_set_brightness(osc, bc->bc_current); - - mutex_exit(osc->sc_mtx); + max = bc->bc_level[bc->bc_level_count - 1]; + if (acpidisp_get_brightness(osc, &bc->bc_current)) + goto out; + for (cur = bc->bc_current; (cur += ACPI_DISP_BRCTL_STEP) <= max;) { + acpidisp_array_search(bc->bc_level, bc->bc_level_count, cur, + &lo, &up); + bc->bc_current = up; + if (acpidisp_set_brightness(osc, bc->bc_current)) + goto out; + if (acpidisp_get_brightness(osc, &bc->bc_current)) + goto out; + if (bc->bc_current >= cur) + break; + } +out: mutex_exit(osc->sc_mtx); } static void @@ -1036,7 +1042,8 @@ acpidisp_out_decrease_brightness_callback(void *arg) { struct acpidisp_out_softc *osc = arg; struct acpidisp_brctl *bc = osc->sc_brctl; - uint8_t lo, up; + uint8_t min, lo, up; + int cur; if (bc == NULL) { /* Fallback to pmf(9). */ @@ -1045,16 +1052,21 @@ acpidisp_out_decrease_brightness_callback(void *arg) } mutex_enter(osc->sc_mtx); - - (void)acpidisp_get_brightness(osc, &bc->bc_current); - - acpidisp_array_search(bc->bc_level, bc->bc_level_count, - bc->bc_current - ACPI_DISP_BRCTL_STEP, &lo, &up); - - bc->bc_current = lo; - (void)acpidisp_set_brightness(osc, bc->bc_current); - - mutex_exit(osc->sc_mtx); + min = bc->bc_level[0]; + if (acpidisp_get_brightness(osc, &bc->bc_current)) + goto out; + for (cur = bc->bc_current; (cur -= ACPI_DISP_BRCTL_STEP) >= min;) { + acpidisp_array_search(bc->bc_level, bc->bc_level_count, cur, + &lo, &up); + bc->bc_current = lo; + if (acpidisp_set_brightness(osc, bc->bc_current)) + goto out; + if (acpidisp_get_brightness(osc, &bc->bc_current)) + goto out; + if (bc->bc_current <= cur) + break; + } +out: mutex_exit(osc->sc_mtx); } static void