Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:23:00 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm [riastradh-drm2]: drmP.h
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Add drm_config_found for foodrm_attach to call to attach drm(4).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.46 -r1.1.1.1.2.47 \
src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 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/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.46 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.47
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.46 Wed Jul 24 03:18:05 2013
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Wed Jul 24 03:23:00 2013
@@ -1484,6 +1484,11 @@ extern long drm_compat_ioctl(struct file
extern int drm_lastclose(struct drm_device *dev);
#endif
+#ifdef __NetBSD__
+extern void drm_config_found(device_t, /* XXXX const */ struct drm_driver *,
+ unsigned long, struct drm_device *);
+#endif
+
/* Device support (drm_fops.h) */
extern struct mutex drm_global_mutex;
#ifdef __NetBSD__
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.9 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.10
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.9 Wed Jul 24 03:22:42 2013
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jul 24 03:23:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.9 2013/07/24 03:22:42 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.10 2013/07/24 03:23:00 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.9 2013/07/24 03:22:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.10 2013/07/24 03:23:00 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -586,3 +586,22 @@ drm_version(struct drm_device *dev, void
out:
return error;
}
+
+void
+drm_config_found(device_t parent, struct drm_driver *driver,
+ unsigned long flags, struct drm_device *dev)
+{
+ int error;
+
+ error = drm_fill_in_dev(dev, NULL, driver);
+ if (error) {
+ aprint_error_dev(parent, "unable to initialize drm: %d\n",
+ error);
+ return;
+ }
+
+ if (config_found_ia(parent, "drmbus", dev, NULL) == NULL) {
+ aprint_error_dev(parent, "unable to attach drm\n");
+ return;
+ }
+}
