Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:56:33 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Call dev->driver->load in drm_attach.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/sys/external/bsd/drm2/drm/drm_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.17 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.18
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.17 Wed Jul 24 03:56:18 2013
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jul 24 03:56:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.17 2013/07/24 03:56:18 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.18 2013/07/24 03:56:33 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.17 2013/07/24 03:56:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.18 2013/07/24 03:56:33 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -304,6 +304,15 @@ drm_attach(device_t parent, device_t sel
return;
}
+ if (dev->driver->load != NULL) {
+ error = (*dev->driver->load)(dev, daa->daa_flags);
+ if (error) {
+ aprint_error_dev(parent, "unable to load driver: %d\n",
+ error);
+ return;
+ }
+ }
+
#if 0 /* XXX drm wsdisplay */
attach wsdisplay;
#endif
