移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/gpu/drm/i915/i915_gem.h
..
..
@@ -28,17 +28,20 @@
28
28
 #include <linux/bug.h>
29
29
 #include <linux/interrupt.h>
30
30
 
31
+#include <drm/drm_drv.h>
32
+
33
+#include "i915_utils.h"
34
+
31
35
 struct drm_i915_private;
32
36
 
33
37
 #ifdef CONFIG_DRM_I915_DEBUG_GEM
34
38
 
35
-#define GEM_SHOW_DEBUG() (drm_debug & DRM_UT_DRIVER)
39
+#define GEM_SHOW_DEBUG() drm_debug_enabled(DRM_UT_DRIVER)
36
40
 
37
41
 #define GEM_BUG_ON(condition) do { if (unlikely((condition))) {	\
38
-		pr_err("%s:%d GEM_BUG_ON(%s)\n", \
39
-		       __func__, __LINE__, __stringify(condition)); \
40
-		GEM_TRACE("%s:%d GEM_BUG_ON(%s)\n", \
41
-			  __func__, __LINE__, __stringify(condition)); \
42
+		GEM_TRACE_ERR("%s:%d GEM_BUG_ON(%s)\n", \
43
+			      __func__, __LINE__, __stringify(condition)); \
44
+		GEM_TRACE_DUMP(); \
42
45
 		BUG(); \
43
46
 		} \
44
47
 	} while(0)
..
..
@@ -47,45 +50,55 @@
47
50
 #define GEM_DEBUG_DECL(var) var
48
51
 #define GEM_DEBUG_EXEC(expr) expr
49
52
 #define GEM_DEBUG_BUG_ON(expr) GEM_BUG_ON(expr)
53
+#define GEM_DEBUG_WARN_ON(expr) GEM_WARN_ON(expr)
50
54
 
51
55
 #else
52
56
 
53
57
 #define GEM_SHOW_DEBUG() (0)
54
58
 
55
59
 #define GEM_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
56
-#define GEM_WARN_ON(expr) (BUILD_BUG_ON_INVALID(expr), 0)
60
+#define GEM_WARN_ON(expr) ({ unlikely(!!(expr)); })
57
61
 
58
62
 #define GEM_DEBUG_DECL(var)
59
63
 #define GEM_DEBUG_EXEC(expr) do { } while (0)
60
64
 #define GEM_DEBUG_BUG_ON(expr)
65
+#define GEM_DEBUG_WARN_ON(expr) ({ BUILD_BUG_ON_INVALID(expr); 0; })
61
66
 #endif
62
67
 
63
68
 #if IS_ENABLED(CONFIG_DRM_I915_TRACE_GEM)
64
69
 #define GEM_TRACE(...) trace_printk(__VA_ARGS__)
65
-#define GEM_TRACE_DUMP() ftrace_dump(DUMP_ALL)
70
+#define GEM_TRACE_ERR(...) do {						\
71
+	pr_err(__VA_ARGS__);						\
72
+	trace_printk(__VA_ARGS__);					\
73
+} while (0)
74
+#define GEM_TRACE_DUMP() \
75
+	do { ftrace_dump(DUMP_ALL); __add_taint_for_CI(TAINT_WARN); } while (0)
66
76
 #define GEM_TRACE_DUMP_ON(expr) \
67
-	do { if (expr) ftrace_dump(DUMP_ALL); } while (0)
77
+	do { if (expr) GEM_TRACE_DUMP(); } while (0)
68
78
 #else
69
79
 #define GEM_TRACE(...) do { } while (0)
80
+#define GEM_TRACE_ERR(...) do { } while (0)
70
81
 #define GEM_TRACE_DUMP() do { } while (0)
71
82
 #define GEM_TRACE_DUMP_ON(expr) BUILD_BUG_ON_INVALID(expr)
72
83
 #endif
73
84
 
74
-#define I915_NUM_ENGINES 8
85
+#define I915_GEM_IDLE_TIMEOUT (HZ / 5)
75
86
 
76
-void i915_gem_park(struct drm_i915_private *i915);
77
-void i915_gem_unpark(struct drm_i915_private *i915);
87
+static inline void tasklet_lock(struct tasklet_struct *t)
88
+{
89
+	while (!tasklet_trylock(t))
90
+		cpu_relax();
91
+}
92
+
93
+static inline bool tasklet_is_locked(const struct tasklet_struct *t)
94
+{
95
+	return test_bit(TASKLET_STATE_RUN, &t->state);
96
+}
78
97
 
79
98
 static inline void __tasklet_disable_sync_once(struct tasklet_struct *t)
80
99
 {
81
-	if (atomic_inc_return(&t->count) == 1)
100
+	if (!atomic_fetch_inc(&t->count))
82
101
 		tasklet_unlock_wait(t);
83
-}
84
-
85
-static inline void __tasklet_enable_sync_once(struct tasklet_struct *t)
86
-{
87
-	if (atomic_dec_return(&t->count) == 0)
88
-		tasklet_kill(t);
89
102
 }
90
103
 
91
104
 static inline bool __tasklet_is_enabled(const struct tasklet_struct *t)
..
..
@@ -93,4 +106,26 @@
93
106
 	return !atomic_read(&t->count);
94
107
 }
95
108
 
109
+static inline bool __tasklet_enable(struct tasklet_struct *t)
110
+{
111
+	return atomic_dec_and_test(&t->count);
112
+}
113
+
114
+static inline bool __tasklet_is_scheduled(struct tasklet_struct *t)
115
+{
116
+	return test_bit(TASKLET_STATE_SCHED, &t->state);
117
+}
118
+
119
+struct i915_gem_ww_ctx {
120
+	struct ww_acquire_ctx ctx;
121
+	struct list_head obj_list;
122
+	bool intr;
123
+	struct drm_i915_gem_object *contended;
124
+};
125
+
126
+void i915_gem_ww_ctx_init(struct i915_gem_ww_ctx *ctx, bool intr);
127
+void i915_gem_ww_ctx_fini(struct i915_gem_ww_ctx *ctx);
128
+int __must_check i915_gem_ww_ctx_backoff(struct i915_gem_ww_ctx *ctx);
129
+void i915_gem_ww_unlock_single(struct drm_i915_gem_object *obj);
130
+
96
131
 #endif /* __I915_GEM_H__ */