[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Hack to disable up...

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

details:   https://anonhg.NetBSD.org/src/rev/62eebb5a8884
branches:  trunk
changeset: 1028564:62eebb5a8884
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:20:11 2021 +0000

description:
i915: Hack to disable upstream i915_sw_fence.h.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r aaed6d4e1a4f -r 62eebb5a8884 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:20:02 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h       Sun Dec 19 11:20:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_sw_fence.h,v 1.3 2021/12/19 11:10:56 riastradh Exp $      */
+/*     $NetBSD: i915_sw_fence.h,v 1.4 2021/12/19 11:20:11 riastradh Exp $      */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -8,6 +8,10 @@
  * Copyright (C) 2016 Intel Corporation
  */
 
+#ifdef __NetBSD__
+#include_next "i915_sw_fence.h"
+#else
+
 #ifndef _I915_SW_FENCE_H_
 #define _I915_SW_FENCE_H_
 
@@ -119,3 +123,5 @@
 }
 
 #endif /* _I915_SW_FENCE_H_ */
+
+#endif /* __NetBSD__ */