[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Ifdef out i915's local h...

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

details:   https://anonhg.NetBSD.org/src/rev/869edf92b359
branches:  trunk
changeset: 1028439:869edf92b359
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:03:25 2021 +0000

description:
Ifdef out i915's local hacks reaching into tasklet's private parts.

Moved i915 tasklet hacks into tasklet proper.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.h |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r fa06ebaaa5d6 -r 869edf92b359 sys/external/bsd/drm2/dist/drm/i915/i915_gem.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h    Sun Dec 19 11:03:17 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h    Sun Dec 19 11:03:25 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem.h,v 1.4 2021/12/19 01:43:28 riastradh Exp $   */
+/*     $NetBSD: i915_gem.h,v 1.5 2021/12/19 11:03:25 riastradh Exp $   */
 
 /*
  * Copyright © 2016 Intel Corporation
@@ -93,6 +93,8 @@
                cpu_relax();
 }
 
+#ifndef __NetBSD__
+
 static inline bool tasklet_is_locked(const struct tasklet_struct *t)
 {
        return test_bit(TASKLET_STATE_RUN, &t->state);
@@ -106,11 +108,7 @@
 
 static inline bool __tasklet_is_enabled(const struct tasklet_struct *t)
 {
-#ifdef __NetBSD__
-       return tasklet_is_enabled(t);
-#else
        return !atomic_read(&t->count);
-#endif
 }
 
 static inline bool __tasklet_enable(struct tasklet_struct *t)
@@ -123,4 +121,6 @@
        return test_bit(TASKLET_STATE_SCHED, &t->state);
 }
 
+#endif
+
 #endif /* __I915_GEM_H__ */