 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,49 +20,57 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/ioccom.h>
 #include <sys/kauth.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <drm/drmP.h>
 static int drm_minor_types[] = {
 	DRM_MINOR_LEGACY,
 	DRM_MINOR_CONTROL,
 #if 0				/* XXX Nothing seems to use this?  */
 	DRM_MINOR_RENDER,
 #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)];
 	unsigned int		sc_opencount;
 	bool			sc_initialized;
 };
 struct drm_attach_args {
 	struct drm_device	*daa_drm_dev;
 	struct drm_driver	*daa_driver;
 	unsigned long		daa_flags;
 };
 @@ -287,28 +295,29 @@ drm_attach(device_t parent, device_t sel
 		    makedev(cdevsw_lookup_major(&drm_cdevsw),
 			sc->sc_minor[i].index);
 		sc->sc_minor[i].kdev = self;
 		sc->sc_minor[i].dev = dev;
 		sc->sc_minor[i].master = NULL;
 		INIT_LIST_HEAD(&sc->sc_minor[i].master_list);
 		(void)memset(&sc->sc_minor[i].mode_group, 0,
 		    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->control =
-	dev->primary = &sc->sc_minor[DRM_MINOR_LEGACY];
+		    &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) {
 		aprint_error_dev(parent, "unable to initialize drm: %d\n",
 		    error);
 		goto fail0;
+	}
 	KASSERT(dev->driver == daa->daa_driver);
 	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",