Module Name: src
Committed By: riastradh
Date: Tue Jan 21 20:56:20 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c
Log Message:
Initialize the right minor numbers...arghhhh.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 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.28 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.29
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.28 Tue Jan 21 20:56:00 2014
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Tue Jan 21 20:56:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.28 2014/01/21 20:56:00 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.29 2014/01/21 20:56:20 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.28 2014/01/21 20:56:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.29 2014/01/21 20:56:20 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -53,6 +53,14 @@ static int drm_minor_types[] = {
#endif
};
+static int drm_type_minors[] = {
+ [DRM_MINOR_LEGACY] = 0,
+ [DRM_MINOR_CONTROL] = 1,
+#if 0
+ [DRM_MINOR_RENDER] = 2,
+#endif
+};
+
struct drm_softc {
struct drm_device *sc_drm_dev;
struct drm_minor sc_minor[__arraycount(drm_minor_types)];
@@ -297,8 +305,9 @@ drm_attach(device_t parent, device_t sel
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];
+ dev->control =
+ &sc->sc_minor[drm_type_minors[DRM_MINOR_CONTROL]];
+ dev->primary = &sc->sc_minor[drm_type_minors[DRM_MINOR_LEGACY]];
error = drm_fill_in_dev(dev, NULL, daa->daa_driver);
if (error) {
