Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:56:14 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Added Files:
src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c
Log Message:
Override i915_gem_userptr.c with stubs for now.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.24 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.25
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.24 Mon Aug 27 07:55:17 2018
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Mon Aug 27 07:56:13 2018
@@ -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/i91
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
Added files:
Index: src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.1
--- /dev/null Mon Aug 27 07:56:14 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Mon Aug 27 07:56:13 2018
@@ -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;
+}
