svn commit: r200584 - in head/sys: dev/dpms isa
Jung-uk Kim
jkim at FreeBSD.org
Tue Dec 15 11:58:23 PST 2009
Author: jkim
Date: Tue Dec 15 19:58:23 2009
New Revision: 200584
URL: http://svn.freebsd.org/changeset/base/200584
Log:
Attach dpms(4) to vgapm and make sure to restore DPMS state after
VGA is resumed properly.
Reviewed by: jhb
Modified:
head/sys/dev/dpms/dpms.c
head/sys/isa/vga_isa.c
Modified: head/sys/dev/dpms/dpms.c
==============================================================================
--- head/sys/dev/dpms/dpms.c Tue Dec 15 18:49:47 2009 (r200583)
+++ head/sys/dev/dpms/dpms.c Tue Dec 15 19:58:23 2009 (r200584)
@@ -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);
}
Modified: head/sys/isa/vga_isa.c
==============================================================================
--- head/sys/isa/vga_isa.c Tue Dec 15 18:49:47 2009 (r200583)
+++ head/sys/isa/vga_isa.c Tue Dec 15 19:58:23 2009 (r200584)
@@ -328,6 +328,9 @@ static int
vgapm_attach(device_t dev)
{
+ bus_generic_probe(dev);
+ bus_generic_attach(dev);
+
return (0);
}
More information about the svn-src-head
mailing list