Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:10:56 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_sw_fence.h
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_object.h
Log Message:
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 <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.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.2 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.2 Sat Dec 18 23:45:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.h Sun Dec 19 11:10:56 2021
@@ -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 @@ void __i915_sw_fence_init(struct i915_sw
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; \
Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h:1.3 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h:1.3 Sun Dec 19 01:24:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.h Sun Dec 19 11:10:56 2021
@@ -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 @@ void i915_gem_object_truncate(struct drm
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);
