 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_drm.c,v 1.15 2018/08/27 15:22:54 riastradh Exp $	*/
+/*	$NetBSD: nouveau_drm.c,v 1.16 2018/12/21 07:51:17 maya Exp $	*/
 /*
  * Copyright 2012 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.15 2018/08/27 15:22:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.16 2018/12/21 07:51:17 maya Exp $");
 #include <linux/console.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
 #include "drmP.h"
 #include "drm_crtc_helper.h"
 #include <core/gpuobj.h>
 #include <core/option.h>
 @@ -944,52 +944,82 @@ nouveau_ioctls[] = {
 	DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_abi16_ioctl_channel_alloc, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_abi16_ioctl_channel_free, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_abi16_ioctl_grobj_alloc, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_NOTIFIEROBJ_ALLOC, nouveau_abi16_ioctl_notifierobj_alloc, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_GPUOBJ_FREE, nouveau_abi16_ioctl_gpuobj_free, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_NEW, nouveau_gem_ioctl_new, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_PUSHBUF, nouveau_gem_ioctl_pushbuf, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_CPU_PREP, nouveau_gem_ioctl_cpu_prep, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_CPU_FINI, nouveau_gem_ioctl_cpu_fini, DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_INFO, nouveau_gem_ioctl_info, DRM_AUTH|DRM_RENDER_ALLOW),
 };
-#ifndef __NetBSD__		/* XXX nouveau pm */
+#ifdef __NetBSD__
 #include <sys/file.h>
 #include <sys/ioccom.h>
 static int			/* XXX expose to ioc32 */
 nouveau_ioctl_override(struct file *fp, unsigned long cmd, void *data)
+{
 	struct drm_file *file = fp->f_data;
 	struct drm_device *dev = file->minor->dev;
 	int ret;
 	ret = pm_runtime_get_sync(dev->dev);
 	if (ret < 0 && ret != -EACCES)
 		return ret;
 	switch (DRM_IOCTL_NR(cmd) - DRM_COMMAND_BASE) {
 	case DRM_NOUVEAU_NVIF:
 		/* XXX errno NetBSD->Linux */
 		ret = -usif_ioctl(file, data, IOCPARM_LEN(cmd));
 		break;
 	default:
 		ret = drm_ioctl(fp, cmd, data);
 		break;
+	}
 	pm_runtime_mark_last_busy(dev->dev);
 	pm_runtime_put_autosuspend(dev->dev);
 	return ret;
+}
 #else
 long
 nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
 	struct drm_file *filp = file->private_data;
 	struct drm_device *dev = filp->minor->dev;
 	long ret;
 	ret = pm_runtime_get_sync(dev->dev);
 	if (ret < 0 && ret != -EACCES)
 		return ret;
 	switch (_IOC_NR(cmd) - DRM_COMMAND_BASE) {
 	case DRM_NOUVEAU_NVIF:
 		ret = usif_ioctl(filp, (void __user *)arg, _IOC_SIZE(cmd));
 		break;
 	default:
 		ret = drm_ioctl(file, cmd, arg);
 		break;
+	}
 	pm_runtime_mark_last_busy(dev->dev);
 	pm_runtime_put_autosuspend(dev->dev);
 	return ret;
+}
 #endif
 #ifndef __NetBSD__
 static const struct file_operations
 nouveau_driver_fops = {
 	.owner = THIS_MODULE,
 	.open = drm_open,
 	.release = drm_release,
 	.unlocked_ioctl = nouveau_drm_ioctl,
 	.mmap = nouveau_ttm_mmap,
 	.poll = drm_poll,
 	.read = drm_read,
 #if defined(CONFIG_COMPAT)
 	.compat_ioctl = nouveau_compat_ioctl,
 #endif
 	.llseek = noop_llseek,
 @@ -1016,26 +1046,27 @@ driver_stub = {
 	.get_vblank_counter = drm_vblank_no_hw_counter,
 	.enable_vblank = nouveau_display_vblank_enable,
 	.disable_vblank = nouveau_display_vblank_disable,
 	.get_scanout_position = nouveau_display_scanoutpos,
 	.get_vblank_timestamp = nouveau_display_vblstamp,
 	.ioctls = nouveau_ioctls,
 	.num_ioctls = ARRAY_SIZE(nouveau_ioctls),
 #ifdef __NetBSD__
 	.fops = NULL,
 	.mmap_object = &nouveau_ttm_mmap_object,
 	.gem_uvm_ops = &nouveau_gem_uvm_ops,
 	.ioctl_override = nouveau_ioctl_override,
 #else
 	.fops = &nouveau_driver_fops,
 #endif
 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
 	.gem_prime_export = drm_gem_prime_export,
 	.gem_prime_import = drm_gem_prime_import,
 	.gem_prime_pin = nouveau_gem_prime_pin,
 	.gem_prime_res_obj = nouveau_gem_prime_res_obj,
 	.gem_prime_unpin = nouveau_gem_prime_unpin,
 	.gem_prime_get_sg_table = nouveau_gem_prime_get_sg_table,
 	.gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table,

 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_usif.c,v 1.5 2018/08/27 07:43:16 riastradh Exp $	*/
+/*	$NetBSD: nouveau_usif.c,v 1.6 2018/12/21 07:51:17 maya Exp $	*/
 /*
  * Copyright 2014 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs <bskeggs@redhat.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_usif.c,v 1.5 2018/08/27 07:43:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_usif.c,v 1.6 2018/12/21 07:51:17 maya Exp $");
 #include "nouveau_drm.h"
 #include "nouveau_usif.h"
 #include "nouveau_abi16.h"
 #include <nvif/notify.h>
 #include <nvif/unpack.h>
 #include <nvif/client.h>
 #include <nvif/event.h>
 #include <nvif/ioctl.h>
 struct usif_notify_p {
 	struct drm_pending_event base;
 @@ -295,43 +295,51 @@ usif_object_new(struct drm_file *f, void
 		args->v0.route = NVDRM_OBJECT_USIF;
 		args->v0.token = (unsigned long)(void *)object;
 		ret = nvif_client_ioctl(client, argv, argc);
 		args->v0.token = object->token;
 		args->v0.route = object->route;
+	}
 	if (ret)
 		usif_object_dtor(object);
 	return ret;
+}
 int
 #ifdef __NetBSD__
 usif_ioctl(struct drm_file *filp, void *data, u32 argc)
 #else
 usif_ioctl(struct drm_file *filp, void __user *user, u32 argc)
 #endif
+{
 	struct nouveau_cli *cli = nouveau_cli(filp);
 	struct nvif_client *client = &cli->base;
 #ifndef __NetBSD__
 	void *data = kmalloc(argc, GFP_KERNEL);
 #endif
 	u32   size = argc;
 	union {
 		struct nvif_ioctl_v0 v0;
 	} *argv = data;
 	struct usif_object *object;
 	u8 owner;
 	int ret;
 #ifndef __NetBSD__
 	if (ret = -ENOMEM, !argv)
 		goto done;
 	if (ret = -EFAULT, copy_from_user(argv, user, size))
 		goto done;
 #endif
 	if (nvif_unpack(argv->v0, 0, 0, true)) {
 		/* block access to objects not created via this interface */
 		owner = argv->v0.owner;
 		if (argv->v0.object == 0ULL &&
 		    argv->v0.type != NVIF_IOCTL_V0_DEL)
 			argv->v0.owner = NVDRM_OBJECT_ANY; /* except client */
 		else
 			argv->v0.owner = NVDRM_OBJECT_USIF;
 	} else
 		goto done;
 	/* USIF slightly abuses some return-only ioctl members in order
 @@ -375,30 +383,34 @@ usif_ioctl(struct drm_file *filp, void _
 		argv->v0.route = object->route;
 		argv->v0.token = object->token;
 		if (ret == 0 && argv->v0.type == NVIF_IOCTL_V0_DEL) {
 			list_del(&object->head);
 			kfree(object);
+		}
 	} else {
 		argv->v0.route = NVIF_IOCTL_V0_ROUTE_HIDDEN;
 		argv->v0.token = 0;
+	}
 	argv->v0.owner = owner;
 	mutex_unlock(&cli->mutex);
 #ifndef __NetBSD__
 	if (copy_to_user(user, argv, argc))
 		ret = -EFAULT;
 #endif
 done:
 #ifndef __NetBSD__
 	kfree(argv);
 #endif
 	return ret;
+}
 void
 usif_client_fini(struct nouveau_cli *cli)
+{
 	struct usif_object *object, *otemp;
 	struct usif_notify *notify, *ntemp;
 	list_for_each_entry_safe(notify, ntemp, &cli->notifys, head) {
 		usif_notify_dtor(notify);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drmP.h,v 1.34 2018/08/28 03:41:39 riastradh Exp $	*/
+/*	$NetBSD: drmP.h,v 1.35 2018/12/21 07:51:18 maya Exp $	*/
 /*
  * Internal Header for the Direct Rendering Manager
+ *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * Copyright (c) 2009-2010, Code Aurora Forum.
  * All rights reserved.
+ *
  * Author: Rickard E. (Rik) Faith <faith@valinux.com>
  * Author: Gareth Hughes <gareth@valinux.com>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
 @@ -700,26 +700,30 @@ struct drm_driver {
 	int major;
 	int minor;
 	int patchlevel;
 	const char *name;
 	const char *desc;
 	const char *date;
 	u32 driver_features;
 	int dev_priv_size;
 	const struct drm_ioctl_desc *ioctls;
 	int num_ioctls;
 	const struct file_operations *fops;
 #ifdef __NetBSD__
 	int (*ioctl_override)(struct file *, unsigned long, void *);
 #endif
 	/* List of devices hanging off this driver with stealth attach. */
 	struct list_head legacy_dev_list;
 };
 enum drm_minor_type {
 	DRM_MINOR_LEGACY,
 	DRM_MINOR_CONTROL,
 	DRM_MINOR_RENDER,
 	DRM_MINOR_CNT,
 };
 #ifdef __NetBSD__		/* XXX debugfs */
 struct seq_file;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_cdevsw.c,v 1.12 2018/08/28 03:41:39 riastradh Exp $	*/
+/*	$NetBSD: drm_cdevsw.c,v 1.13 2018/12/21 07:51:18 maya 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_cdevsw.c,v 1.12 2018/08/28 03:41:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.13 2018/12/21 07:51:18 maya 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>
 #ifndef _MODULE
 /* XXX Mega-kludge because modules are broken.  */
 #include <sys/once.h>
 #endif
 @@ -60,26 +60,27 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c
 #include <drm/drmP.h>
 #include <drm/drm_internal.h>
 #include "../dist/drm/drm_legacy.h"
 static dev_type_open(drm_open);
 static int	drm_firstopen(struct drm_device *);
 static int	drm_close(struct file *);
 static int	drm_read(struct file *, off_t *, struct uio *, kauth_cred_t,
 		    int);
 static int	drm_dequeue_event(struct drm_file *, size_t,
 		    struct drm_pending_event **, int);
 static int	drm_ioctl_shim(struct file *, unsigned long, void *);
 static int	drm_poll(struct file *, int);
 static int	drm_kqfilter(struct file *, struct knote *);
 static int	drm_stat(struct file *, struct stat *);
 static int	drm_fop_mmap(struct file *, off_t *, size_t, int, int *, int *,
 			     struct uvm_object **, int *);
 static paddr_t	drm_legacy_mmap(dev_t, off_t, int);
 const struct cdevsw drm_cdevsw = {
 	.d_open = drm_open,
 	.d_close = noclose,
 	.d_read = noread,
 	.d_write = nowrite,
 	.d_ioctl = noioctl,
 @@ -88,27 +89,27 @@ const struct cdevsw drm_cdevsw = {
 	.d_poll = nopoll,
 	.d_mmap = drm_legacy_mmap,
 	.d_kqfilter = nokqfilter,
 	.d_discard = nodiscard,
 	/* XXX was D_TTY | D_NEGOFFSAFE */
 	/* XXX Add D_MPSAFE some day... */
 	.d_flag = D_NEGOFFSAFE,
 };
 static const struct fileops drm_fileops = {
 	.fo_name = "drm",
 	.fo_read = drm_read,
 	.fo_write = fbadop_write,
-	.fo_ioctl = drm_ioctl,
+	.fo_ioctl = drm_ioctl_shim,
 	.fo_fcntl = fnullop_fcntl,
 	.fo_poll = drm_poll,
 	.fo_stat = drm_stat,
 	.fo_close = drm_close,
 	.fo_kqfilter = drm_kqfilter,
 	.fo_restart = fnullop_restart,
 	.fo_mmap = drm_fop_mmap,
 };
 static int
 drm_open(dev_t d, int flags, int fmt, struct lwp *l)
+{
 	struct drm_minor *dminor;
 @@ -330,26 +331,38 @@ drm_dequeue_event(struct drm_file *file,
 		ret = 0;
 		goto out;
+	}
 	file->event_space += event->event->length;
 	list_del(&event->link);
 out:	spin_unlock_irqrestore(&dev->event_lock, irqflags);
 	*eventp = event;
 	return ret;
+}
 static int
 drm_ioctl_shim(struct file *fp, unsigned long cmd, void *data)
+{
 	struct drm_file *file = fp->f_data;
 	struct drm_driver *driver = file->minor->dev->driver;
 	if (driver->ioctl_override)
 		return driver->ioctl_override(fp, cmd, data);
 	else
 		return drm_ioctl(fp, cmd, data);
+}
 static int
 drm_poll(struct file *fp __unused, int events __unused)
+{
 	struct drm_file *const file = fp->f_data;
 	struct drm_device *const dev = file->minor->dev;
 	int revents = 0;
 	unsigned long irqflags;
 	if (!ISSET(events, (POLLIN | POLLRDNORM)))
 		return 0;
 	spin_lock_irqsave(&dev->event_lock, irqflags);
 	if (list_empty(&file->event_list))
 		selrecord(curlwp, &file->event_selq);

 @@ -1,11 +1,15 @@
-/*	$NetBSD: nouveau_usif.h,v 1.2 2018/08/27 04:58:24 riastradh Exp $	*/
+/*	$NetBSD: nouveau_usif.h,v 1.3 2018/12/21 07:51:17 maya Exp $	*/
 #ifndef __NOUVEAU_USIF_H__
 #define __NOUVEAU_USIF_H__
 void usif_client_init(struct nouveau_cli *);
 void usif_client_fini(struct nouveau_cli *);
 #ifdef __NetBSD__
 int  usif_ioctl(struct drm_file *, void *, u32);
 #else
 int  usif_ioctl(struct drm_file *, void __user *, u32);
 #endif
 int  usif_notify(const void *, u32, const void *, u32);
 #endif