Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 11:20:11 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: i915_sw_fence.h

Log Message:
i915: Hack to disable upstream i915_sw_fence.h.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/drm2/dist/drm/i915/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.3 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.3	Sun Dec 19 11:10:56 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h	Sun Dec 19 11:20:11 2021
@@ -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 @@ i915_sw_fence_set_error_once(struct i915
 }
 
 #endif /* _I915_SW_FENCE_H_ */
+
+#endif	/* __NetBSD__ */

Reply via email to