Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:30:45 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_sw_fence.h
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Removed Files:
src/sys/external/bsd/drm2/i915drm: i915_sw_fence.c i915_sw_fence.h
Log Message:
drm/i915: Undo local i915_sw_fence override.
The code is now MIT-licensed, so we no longer need to rewrite it.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h
cvs rdiff -u -r1.67 -r1.68 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.c
cvs rdiff -u -r1.4 -r0 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h
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/dist/drm/i915/i915_sw_fence.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h:1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h:1.4 Sun Dec 19 11:20:11 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h Sun Dec 19 11:30:45 2021
@@ -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 @@ i915_sw_fence_set_error_once(struct i915
}
#endif /* _I915_SW_FENCE_H_ */
-
-#endif /* __NetBSD__ */
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.67 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.68
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.67 Sun Dec 19 11:27:12 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:30:45 2021
@@ -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_gemf
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
