Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:03:25 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.h
Log Message:
Ifdef out i915's local hacks reaching into tasklet's private parts.
Moved i915 tasklet hacks into tasklet proper.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h:1.4 Sun Dec 19 01:43:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.h Sun Dec 19 11:03:25 2021
@@ -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 @@ static inline void tasklet_lock(struct t
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 void __tasklet_disable_syn
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 @@ static inline bool __tasklet_is_schedule
return test_bit(TASKLET_STATE_SCHED, &t->state);
}
+#endif
+
#endif /* __I915_GEM_H__ */
