Attach dpms(4) to vgapm and make sure to restore DPMS state after

VGA is resumed properly.

Reviewed by:	jhb

2 files changed, 5 insertions, 3 deletions

diff --git a/sys/dev/dpms/dpms.c b/sys/dev/dpms/dpms.c
index 60aafc6..fdfed2f 100644
--- a/sys/dev/dpms/dpms.c
+++ b/sys/dev/dpms/dpms.c
@@ -118,15 +118,14 @@ static driver_t dpms_driver = {
 
 static devclass_t dpms_devclass;
 
-DRIVER_MODULE(dpms, vgapci, dpms_driver, dpms_devclass, NULL, NULL);
+DRIVER_MODULE(dpms, vgapm, dpms_driver, dpms_devclass, NULL, NULL);
 MODULE_DEPEND(dpms, x86bios, 1, 1, 1);
 
 static void
 dpms_identify(driver_t *driver, device_t parent)
 {
 
-	if (device_get_flags(parent) != 0 &&
-	    x86bios_match_device(0xc0000, parent))
+	if (x86bios_match_device(0xc0000, device_get_parent(parent)))
 		device_add_child(parent, "dpms", 0);
 }
 
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 96336d9..f9b2630 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -328,6 +328,9 @@ static int
 vgapm_attach(device_t dev)
 {
 
+	bus_generic_probe(dev);
+	bus_generic_attach(dev);
+
 	return (0);
 }