[src/trunk]: src/sys/external/bsd/drm2/i915drm Override i915_gem_userptr.c wi...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d54a230f3bfc
branches:  trunk
changeset: 835213:d54a230f3bfc
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:56:13 2018 +0000

description:
Override i915_gem_userptr.c with stubs for now.

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms   |   4 +-
 sys/external/bsd/drm2/i915drm/i915_gem_userptr.c |  48 ++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diffs (70 lines):

diff -r dc46a89f21d7 -r d54a230f3bfc sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 07:55:59 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 07:56:13 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.24 2018/08/27 07:55:17 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.25 2018/08/27 07:56:13 riastradh Exp $
 
 define intelfbbus      { }
 device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -49,7 +49,7 @@
 file   external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c     i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c       i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c       i915drmkms
-#file  external/bsd/drm2/dist/drm/i915/i915_gem_userptr.c      i915drmkms
+file   external/bsd/drm2/i915drm/i915_gem_userptr.c    i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_gpu_error.c        i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_guc_submission.c   i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_irq.c      i915drmkms
diff -r dc46a89f21d7 -r d54a230f3bfc sys/external/bsd/drm2/i915drm/i915_gem_userptr.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c  Mon Aug 27 07:56:13 2018 +0000
@@ -0,0 +1,48 @@
+/*     $NetBSD: i915_gem_userptr.c,v 1.1 2018/08/27 07:56:13 riastradh Exp $   */
+
+/*-
+ * Copyright (c) 2018 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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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: i915_gem_userptr.c,v 1.1 2018/08/27 07:56:13 riastradh Exp $");
+
+#include "i915_drv.h"
+
+int
+i915_gem_init_userptr(struct drm_device *dev)
+{
+       return 0;
+}
+
+int
+i915_gem_userptr_ioctl(struct drm_device *dev, void *data,
+    struct drm_file *file)
+{
+       return -ENODEV;
+}