diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2022-02-15 21:17:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2022-02-15 21:17:13 +0000 |
| commit | 9f9f5e89b9211f30cb9832a45b246b5310ec5663 (patch) | |
| tree | dccc6bd295c27c662086252bb33e1769845f25b3 /sys/dev/acpi | |
| parent | 27bd8a0f0430762658cb69f48b69586a9f1db78b (diff) | |
Since acpitoshiba brightness button processing no longer plays games
with AML parsing outside the acpi thread, the locking-release dance
around wsdisplay_{suspend,resume} can be removed
ok kettenis
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi_x86.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/sys/dev/acpi/acpi_x86.c b/sys/dev/acpi/acpi_x86.c index c7756823abb..b46ac7e9784 100644 --- a/sys/dev/acpi/acpi_x86.c +++ b/sys/dev/acpi/acpi_x86.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_x86.c,v 1.6 2022/02/15 16:54:48 deraadt Exp $ */ +/* $OpenBSD: acpi_x86.c,v 1.7 2022/02/15 21:17:12 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -50,7 +50,6 @@ #include <dev/acpi/amltypes.h> #include <dev/acpi/acpidev.h> #include <dev/acpi/dsdt.h> -#include <dev/wscons/wsdisplayvar.h> #include <dev/pci/pcidevs.h> #include <dev/pci/ppbreg.h> @@ -64,7 +63,6 @@ #define APMDEV_CTL 8 #include "wd.h" -#include "wsdisplay.h" #include "softraid.h" int @@ -170,31 +168,3 @@ suspend_finish(void *v) if (acpibtn_numopenlids() == 0 && lid_action != 0) acpi_addtask(sc, acpi_sleep_task, sc, sc->sc_state); } - -void -display_suspend(void *v) -{ -#if NWSDISPLAY > 0 - struct acpi_softc *sc = v; - - /* - * Temporarily release the lock to prevent the X server from - * blocking on setting the display brightness. - */ - rw_exit_write(&sc->sc_lck); - wsdisplay_suspend(); - rw_enter_write(&sc->sc_lck); -#endif /* NWSDISPLAY > 0 */ -} - -void -display_resume(void *v) -{ -#if NWSDISPLAY > 0 - struct acpi_softc *sc = v; - - rw_exit_write(&sc->sc_lck); - wsdisplay_resume(); - rw_enter_write(&sc->sc_lck); -#endif /* NWSDISPLAY > 0 */ -} |