[src/trunk]: src/sys/external/bsd/drm2/i915drm drm/i915: Undo local i915_sw_f...

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

details:   https://anonhg.NetBSD.org/src/rev/f0e9d661d88a
branches:  trunk
changeset: 1028617:f0e9d661d88a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:30:45 2021 +0000

description:
drm/i915: Undo local i915_sw_fence override.

The code is now MIT-licensed, so we no longer need to rewrite it.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h |   8 +-
 sys/external/bsd/drm2/i915drm/files.i915drmkms      |   3 +-
 sys/external/bsd/drm2/i915drm/i915_sw_fence.c       |  35 ---------
 sys/external/bsd/drm2/i915drm/i915_sw_fence.h       |  81 ---------------------
 4 files changed, 2 insertions(+), 125 deletions(-)

diffs (167 lines):

diff -r 4aaf888db741 -r f0e9d661d88a sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h       Sun Dec 19 11:27:27 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h       Sun Dec 19 11:30:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_sw_fence.h,v 1.4 2021/12/19 11:20:11 riastradh Exp $      */
+/*     $NetBSD: i915_sw_fence.h,v 1.5 2021/12/19 11:30:45 riastradh Exp $      */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -8,10 +8,6 @@
  * Copyright (C) 2016 Intel Corporation
  */
 
-#ifdef __NetBSD__
-#include_next "i915_sw_fence.h"
-#else
-
 #ifndef _I915_SW_FENCE_H_
 #define _I915_SW_FENCE_H_
 
@@ -123,5 +119,3 @@
 }
 
 #endif /* _I915_SW_FENCE_H_ */
-
-#endif /* __NetBSD__ */
diff -r 4aaf888db741 -r f0e9d661d88a sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 11:27:27 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 11:30:45 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.67 2021/12/19 11:27:12 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.68 2021/12/19 11:30:45 riastradh Exp $
 
 version        20180827
 
@@ -48,7 +48,6 @@
 file   external/bsd/drm2/i915drm/i915_module.c         i915drmkms
 file   external/bsd/drm2/i915drm/i915_pci_autoconf.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/intel_gtt.c           i915drmkms
 file   external/bsd/drm2/i915drm/intelfb.c             intelfb
diff -r 4aaf888db741 -r f0e9d661d88a sys/external/bsd/drm2/i915drm/i915_sw_fence.c
--- a/sys/external/bsd/drm2/i915drm/i915_sw_fence.c     Sun Dec 19 11:27:27 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*     $NetBSD: i915_sw_fence.c,v 1.1 2021/12/19 00:26:41 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_sw_fence.c,v 1.1 2021/12/19 00:26:41 riastradh Exp $");
-
-#include "i915_sw_fence.h"
diff -r 4aaf888db741 -r f0e9d661d88a sys/external/bsd/drm2/i915drm/i915_sw_fence.h
--- a/sys/external/bsd/drm2/i915drm/i915_sw_fence.h     Sun Dec 19 11:27:27 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*     $NetBSD: i915_sw_fence.h,v 1.4 2021/12/19 11:19:55 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.
- */
-
-#ifndef        _I915DRM_I915_SW_FENCE_H_
-#define        _I915DRM_I915_SW_FENCE_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <linux/gfp.h>
-
-struct dma_fence_ops;
-struct dma_resv;
-struct i915_sw_fence;
-struct i915_sw_fence_cb;
-
-struct i915_sw_fence {
-       char dummy;
-};
-
-struct i915_sw_fence_wait {
-       char dummy;
-};
-
-struct i915_sw_dma_fence_cb {
-       char dummy;
-};
-
-enum i915_sw_fence_notify {
-       FENCE_COMPLETE,
-       FENCE_FREE,
-};
-
-#define        __i915_sw_fence_call    __aligned(4)
-
-void   i915_sw_fence_init(struct i915_sw_fence *,
-           int (*)(struct i915_sw_fence *, enum i915_sw_fence_notify));
-void   i915_sw_fence_fini(struct i915_sw_fence *);
-
-bool   i915_sw_fence_signaled(struct i915_sw_fence *);
-
-void   i915_sw_fence_await_reservation(struct i915_sw_fence *,
-           struct dma_resv *, const struct dma_fence_ops *, bool,
-           unsigned long, gfp_t);
-void   i915_sw_fence_await_sw_fence(struct i915_sw_fence *,
-           struct i915_sw_fence *, struct i915_sw_fence_wait *);
-void   i915_sw_fence_await_sw_fence_gfp(struct i915_sw_fence *,
-           struct i915_sw_fence *, gfp_t);
-int    i915_sw_fence_await_dma_fence(struct i915_sw_fence *,
-           struct dma_fence *, int, gfp_t);
-void   i915_sw_fence_commit(struct i915_sw_fence *);
-
-#endif /* _I915DRM_I915_SW_FENCE_H_ */