 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_drv.c,v 1.1.2.14 2013/07/24 03:55:00 riastradh Exp $	*/
+/*	$NetBSD: drm_drv.c,v 1.1.2.15 2013/07/24 03:55:17 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,27 +20,27 @@
  * ``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.14 2013/07/24 03:55:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.1.2.15 2013/07/24 03:55:17 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>
 #if 0				/* XXX drm event poll */
 #include <sys/poll.h>
 #include <sys/select.h>
 #endif
 @@ -48,26 +48,27 @@ __KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v
 #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
 };
 struct drm_softc {
 	struct drm_device	*sc_drm_dev;
 	struct drm_minor	sc_minor[__arraycount(drm_minor_types)];
 	unsigned int		sc_opencount;
 };
 static int	drm_match(device_t, cfdata_t, void *);
 static void	drm_attach(device_t, device_t, void *);
 static int	drm_detach(device_t, int);
 static struct drm_softc *drm_dev_softc(dev_t);
 static struct drm_minor *drm_dev_minor(dev_t);
 static dev_type_open(drm_open);
 static int	drm_close(struct file *);
 static int	drm_read(struct file *, off_t *, struct uio *, kauth_cred_t,
 @@ -249,26 +250,27 @@ drm_attach(device_t parent, device_t sel
 	struct drm_softc *sc = device_private(self);
 	struct drm_device *dev = aux;
 	unsigned int i;
 	int error;
 	KASSERT(sc != NULL);
 	KASSERT(dev != NULL);
 	KASSERT(dev->driver != NULL);
 	KASSERT(device_unit(self) >= 0);
 	aprint_normal("\n");
 	sc->sc_drm_dev = dev;
 	sc->sc_opencount = 0;
 	if (device_unit(self) >= 64) { /* XXX Need to do something here!  */
 		aprint_error_dev(self, "can't handle >=64 drm devices!");
 		return;
+	}
 	for (i = 0; i < __arraycount(drm_minor_types); i++) {
 		sc->sc_minor[i].index = (i * 64) + device_unit(self);
 		sc->sc_minor[i].type = drm_minor_types[i];
 		sc->sc_minor[i].device =
 		    makedev(cdevsw_lookup_major(&drm_cdevsw),
 			sc->sc_minor[i].index);
 		sc->sc_minor[i].kdev = self;
 @@ -295,26 +297,29 @@ drm_attach(device_t parent, device_t sel
 #endif
+}
 static int
 drm_detach(device_t self, int flags)
+{
 	struct drm_softc *const sc = device_private(self);
 	KASSERT(sc != NULL);
 	struct drm_device *const dev = sc->sc_drm_dev;
 	KASSERT(dev != NULL);
 	const struct drm_driver *const driver = dev->driver;
 	KASSERT(driver != NULL);
 	if (sc->sc_opencount != 0)
 		return EBUSY;
 	/*
 	 * XXX Synchronize with drm_fill_in_dev, perhaps with reference
 	 * to drm_put_dev.
 	 */
 	if (ISSET(driver->driver_features, DRIVER_GEM))
 		drm_gem_destroy(dev);
 	drm_ctxbitmap_cleanup(dev);
 	/* XXX Move to dev->driver->bus->agp_destroy.  */
 	if (drm_core_has_MTRR(dev) &&
 	    drm_core_has_AGP(dev) &&
 @@ -349,69 +354,83 @@ drm_dev_minor(dev_t d)
 	if (sc == NULL)
 		return NULL;
 	const unsigned int i = minor(d) / 64;
 	if (i >= __arraycount(drm_minor_types))
 		return NULL;
 	return &sc->sc_minor[i];
+}
 static int
 drm_open(dev_t d, int flags, int fmt, struct lwp *l)
+{
 	struct drm_softc *const sc = drm_dev_softc(d);
 	struct drm_minor *const dminor = drm_dev_minor(d);
 	int fd;
 	struct file *fp;
 	unsigned int opencount;
 	int error;
 	if (dminor == NULL) {
 		error = ENXIO;
 		goto fail0;
+	}
 	if (flags & O_EXCL) {
 		error = EBUSY;
 		goto fail0;
+	}
 	if (dminor->dev->switch_power_state != DRM_SWITCH_POWER_ON) {
 		error = EINVAL;
 		goto fail0;
+	}
 	do {
 		opencount = sc->sc_opencount;
 		if (opencount == UINT_MAX) {
 			error = EBUSY;
 			goto fail0;
+		}
 	} while (atomic_cas_uint(&sc->sc_opencount, opencount, (opencount + 1))
 	    != opencount);
 	error = fd_allocfile(&fp, &fd);
 	if (error)
-		goto fail0;
+		goto fail1;
 	struct drm_file *const file = kmem_zalloc(sizeof(*file), KM_SLEEP);
 	/* XXX errno Linux->NetBSD */
 	error = -drm_open_file(file, fp, dminor);
 	if (error)
-		goto fail2;
+		goto fail3;
 	error = fd_clone(fp, fd, flags, &drm_fileops, file);
 	KASSERT(error == EMOVEFD); /* XXX */
 	/* Success!  (But error has to be EMOVEFD, not 0.)  */
 	return error;
-fail2:
+fail3:
 	kmem_free(file, sizeof(*file));
-fail1: __unused
+fail2: __unused
 	fd_abort(curproc, fp, fd);
 fail1:
 	atomic_dec_uint(&sc->sc_opencount);
 fail0:
 	return error;
+}
 static int
 drm_close(struct file *fp)
+{
 	struct drm_file *const file = fp->f_data;
 	/* XXX errno Linux->NetBSD */
 	return -drm_close_file(file);
+}