Module Name: src
Committed By: riastradh
Date: Mon Dec 20 19:54:07 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.h
Log Message:
i915: Obviate need for __diagused on variables in GEM_BUG_ON.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.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_gem.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h:1.6 Sun Dec 19 12:08:54 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h Mon Dec 20 19:54:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem.h,v 1.6 2021/12/19 12:08:54 riastradh Exp $ */
+/* $NetBSD: i915_gem.h,v 1.7 2021/12/20 19:54:07 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -42,8 +42,12 @@ struct drm_i915_private;
#define GEM_SHOW_DEBUG() drm_debug_enabled(DRM_UT_DRIVER)
#ifdef __NetBSD__
+#ifdef DIAGNOSTIC
#define GEM_BUG_ON(condition) KASSERT(!(condition))
#else
+#define GEM_BUG_ON(condition) BUILD_BUG_ON_INVALID(condition)
+#endif
+#else
#define GEM_BUG_ON(condition) do { if (unlikely((condition))) { \
GEM_TRACE_ERR("%s:%d GEM_BUG_ON(%s)\n", \
__func__, __LINE__, __stringify(condition)); \
