Module Name: src
Committed By: riastradh
Date: Wed Jul 24 04:01:37 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Initialize dev->dev, dev->primary, and dev->control in drm_attach.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.20 -r1.1.2.21 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.20 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.21
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.20 Wed Jul 24 03:58:36 2013
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jul 24 04:01:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.20 2013/07/24 03:58:36 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.21 2013/07/24 04:01:37 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.20 2013/07/24 03:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.21 2013/07/24 04:01:37 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -293,6 +293,12 @@ drm_attach(device_t parent, device_t sel
sizeof(sc->sc_minor[i].mode_group));
}
+ dev->dev = self;
+
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
+ dev->control = &sc->sc_minor[DRM_MINOR_CONTROL];
+ dev->primary = &sc->sc_minor[DRM_MINOR_LEGACY];
+
error = drm_fill_in_dev(dev, NULL, daa->daa_driver);
if (error) {
aprint_error_dev(parent, "unable to initialize drm: %d\n",
