Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:40:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Added Files:
src/sys/external/bsd/drm2/i915drm: i915_gemfs.c i915_perf.c
Log Message:
Stub out i915_gemfs.c and i915_perf.c.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/i915drm/i915_gemfs.c \
src/sys/external/bsd/drm2/i915drm/i915_perf.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.47 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.48
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.47 Sun Dec 19 01:39:48 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 01:40:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.47 2021/12/19 01:39:48 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.48 2021/12/19 01:40:34 riastradh Exp $
version 20180827
@@ -37,13 +37,15 @@ makeoptions i915drmkms "CWARNFLAGS.int
makeoptions i915drmkms "CWARNFLAGS.intel_sdvo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-implicit-fallthrough :}"
file external/bsd/drm2/i915drm/i915_gem_userptr.c i915drmkms
+file external/bsd/drm2/i915drm/i915_gemfs.c i915drmkms
file external/bsd/drm2/i915drm/i915_module.c i915drmkms
file external/bsd/drm2/i915drm/i915_pci.c i915drmkms
+file external/bsd/drm2/i915drm/i915_perf.c i915drmkms
file external/bsd/drm2/i915drm/i915_sw_fence.c i915drmkms
file external/bsd/drm2/i915drm/i915_sysfs.c i915drmkms
-file external/bsd/drm2/i915drm/vlv_dsi.c i915drmkms
file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms
file external/bsd/drm2/i915drm/intelfb.c intelfb
+file external/bsd/drm2/i915drm/vlv_dsi.c i915drmkms
# Generated from i915drmkms2netbsd.
file external/bsd/drm2/dist/drm/i915/display/dvo_ch7017.c i915drmkms
file external/bsd/drm2/dist/drm/i915/display/dvo_ch7xxx.c i915drmkms
@@ -109,7 +111,6 @@ file external/bsd/drm2/dist/drm/i915/gem
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_domain.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_execbuffer.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_fence.c i915drmkms
-file external/bsd/drm2/dist/drm/i915/gem/i915_gemfs.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_internal.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_lmem.c i915drmkms
file external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c i915drmkms
@@ -187,7 +188,6 @@ file external/bsd/drm2/dist/drm/i915/i91
#file external/bsd/drm2/dist/drm/i915/i915_mm.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_params.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_pci.c i915drmkms
-file external/bsd/drm2/dist/drm/i915/i915_perf.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_query.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_request.c i915drmkms
file external/bsd/drm2/dist/drm/i915/i915_scatterlist.c i915drmkms
Added files:
Index: src/sys/external/bsd/drm2/i915drm/i915_gemfs.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_gemfs.c:1.1
--- /dev/null Sun Dec 19 01:40:34 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_gemfs.c Sun Dec 19 01:40:34 2021
@@ -0,0 +1,46 @@
+/* $NetBSD: i915_gemfs.c,v 1.1 2021/12/19 01:40:34 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_gemfs.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $");
+
+#include "i915_gemfs.h"
+
+int
+i915_gemfs_init(struct drm_i915_private *i915)
+{
+ return 0;
+}
+
+void
+i915_gemfs_fini(struct drm_i915_private *i915)
+{
+}
Index: src/sys/external/bsd/drm2/i915drm/i915_perf.c
diff -u /dev/null src/sys/external/bsd/drm2/i915drm/i915_perf.c:1.1
--- /dev/null Sun Dec 19 01:40:34 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_perf.c Sun Dec 19 01:40:34 2021
@@ -0,0 +1,45 @@
+/* $NetBSD: i915_perf.c,v 1.1 2021/12/19 01:40:34 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_perf.c,v 1.1 2021/12/19 01:40:34 riastradh Exp $");
+
+#include "i915_drv.h"
+
+void
+i915_perf_init(struct drm_i915_private *i915)
+{
+}
+
+void
+i915_gemfs_fini(struct drm_i915_private *i915)
+{
+}
