From owner-svn-src-all@FreeBSD.ORG  Tue Dec 15 19:58:23 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CFCEF1065676;
	Tue, 15 Dec 2009 19:58:23 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF9DD8FC15;
	Tue, 15 Dec 2009 19:58:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBFJwNK7073503;
	Tue, 15 Dec 2009 19:58:23 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBFJwNS4073500;
	Tue, 15 Dec 2009 19:58:23 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200912151958.nBFJwNS4073500@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 15 Dec 2009 19:58:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200584 - in head/sys: dev/dpms isa
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2009 19:58:23 -0000

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);
 }