[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Switch #ifdef CONFIG_WHA...

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

details:   https://anonhg.NetBSD.org/src/rev/6528d76bfd27
branches:  trunk
changeset: 1028495:6528d76bfd27
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:10:56 2021 +0000

description:
Switch #ifdef CONFIG_WHATEVER to #if IS_ENABLED(CONFIG_WHATEVER)

Our IS_ENABLED should probably be #if defined(option) && (option),
but that becomes tricky with evaluation order. If option gets
expanded earlier, this errors out (e.g. with CONFIG_AGP)


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h |  4 ++--
 sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h       |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 6fda4b3d245a -r 6528d76bfd27 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h
--- a/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h Sun Dec 19 11:10:48 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h Sun Dec 19 11:10:56 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_object.h,v 1.3 2021/12/19 01:24:25 riastradh Exp $    */
+/*     $NetBSD: i915_gem_object.h,v 1.4 2021/12/19 11:10:56 riastradh Exp $    */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -69,7 +69,7 @@
 static inline struct drm_i915_gem_object *
 i915_gem_object_lookup_rcu(struct drm_file *file, u32 handle)
 {
-#ifdef CONFIG_LOCKDEP
+#if IS_ENABLED(CONFIG_LOCKDEP)
        WARN_ON(debug_locks && !lock_is_held(&rcu_lock_map));
 #endif
        return idr_find(&file->object_idr, handle);
diff -r 6fda4b3d245a -r 6528d76bfd27 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:10:48 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h       Sun Dec 19 11:10:56 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_sw_fence.h,v 1.2 2021/12/18 23:45:28 riastradh Exp $      */
+/*     $NetBSD: i915_sw_fence.h,v 1.3 2021/12/19 11:10:56 riastradh Exp $      */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -44,7 +44,7 @@
                          i915_sw_fence_notify_t fn,
                          const char *name,
                          struct lock_class_key *key);
-#ifdef CONFIG_LOCKDEP
+#if IS_ENABLED(CONFIG_LOCKDEP)
 #define i915_sw_fence_init(fence, fn)                          \
 do {                                                           \
        static struct lock_class_key __key;                     \