 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_display.c,v 1.4 2010/10/28 21:45:02 gsutre Exp $	*/
+/*	$NetBSD: acpi_display.c,v 1.5 2010/10/29 09:04:38 gsutre Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gregoire Sutre.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * (sysctl).  The ACPI display adapter's mutex is shared with all ACPI display
  * output devices attached to it.
+ *
  * The mutex only prevents undesired interleavings of ACPI notify handlers,
  * sysctl callbacks, and pmf(9) suspend/resume routines.  Race conditions with
  * autoconf(9) detachment routines could, in theory, still occur.
+ *
  * The array of connected output devices (sc_odinfo) is, after attachment, only
  * used in ACPI notify handler callbacks.  Since two such callbacks cannot be
  * running simultaneously, this information does not need protection.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.4 2010/10/28 21:45:02 gsutre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.5 2010/10/29 09:04:38 gsutre Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/acpi/acpireg.h>
 @@ -901,34 +901,40 @@ acpidisp_out_notify_handler(ACPI_HANDLE
  * (b) ACPI display notify callbacks are scheduled with AcpiOsExecute,
  * (c) callbacks scheduled with AcpiOsExecute are executed sequentially.
  */
 static void
 acpidisp_vga_cycle_output_device_callback(void *arg)
+{
 	struct acpidisp_vga_softc *asc = arg;
 	struct acpidisp_odinfo *oi = asc->sc_odinfo;
 	struct acpidisp_outdev *od;
 	struct acpidisp_out_softc *osc, *last_osc;
 	acpidisp_od_state_t state, last_state;
 	acpidisp_od_status_t status;
 	acpidisp_bios_policy_t lock_policy;
 	uint32_t i;
 	if (oi == NULL)
 		return;
 	/* Mutual exclusion with callbacks of connected output devices. */
 	mutex_enter(&asc->sc_mtx);
 	/* Lock the _DGS values. */
 	lock_policy = asc->sc_policy;
 	lock_policy.fmt.output = ACPI_DISP_POLICY_OUTPUT_LOCKED;
 	(void)acpidisp_set_policy(asc, lock_policy.raw);
 	last_osc = NULL;
 	for (i = 0, od = oi->oi_dev; i < oi->oi_dev_count; i++, od++) {
 		if (od->od_device == NULL)
 			continue;
 		osc = device_private(od->od_device);
 		if (!(osc->sc_caps & ACPI_DISP_OUT_CAP__DSS))
 			continue;
 		if (acpidisp_get_state(osc, &state.raw))
 			continue;
 		if (acpidisp_get_status(osc, &status.raw)) {
 			state.fmt.no_switch = 0;
 @@ -945,26 +951,29 @@ acpidisp_vga_cycle_output_device_callbac
 		if (last_osc != NULL)
 			(void)acpidisp_set_state(last_osc, last_state.raw);
 		last_osc = osc;
 		last_state = state;
+	}
 	if (last_osc != NULL) {
 		last_state.fmt.commit = 1;
 		(void)acpidisp_set_state(last_osc, last_state.raw);
+	}
 	/* Restore the original BIOS policy. */
 	(void)acpidisp_set_policy(asc, asc->sc_policy.raw);
 	mutex_exit(&asc->sc_mtx);
+}
 static void
 acpidisp_vga_output_device_change_callback(void *arg)
+{
 	struct acpidisp_vga_softc *asc = arg;
 	struct acpidisp_odinfo *oi = asc->sc_odinfo;
 	bool switch_outputs;
 	if (oi != NULL) {
 		kmem_free(oi->oi_dev,
 		    oi->oi_dev_count * sizeof(*oi->oi_dev));