2018-12-28 09:04:16 +00:00
|
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
Date: Wed, 19 Dec 2018 10:47:02 +0100
|
2019-11-25 00:04:39 +00:00
|
|
|
Subject: [PATCH 256/290] drm/i915: skip DRM_I915_LOW_LEVEL_TRACEPOINTS with
|
2019-04-08 23:49:20 +00:00
|
|
|
NOTRACE
|
2019-11-25 00:04:39 +00:00
|
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=847acb068749101352be88fb869b853c5c5c9150
|
2018-12-28 09:04:16 +00:00
|
|
|
|
|
|
|
|
The order of the header files is important. If this header file is
|
|
|
|
|
included after tracepoint.h was included then the NOTRACE here becomes a
|
|
|
|
|
nop. Currently this happens for two .c files which use the tracepoitns
|
|
|
|
|
behind DRM_I915_LOW_LEVEL_TRACEPOINTS.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
---
|
2019-04-08 23:49:20 +00:00
|
|
|
drivers/gpu/drm/i915/i915_trace.h | 2 +-
|
2018-12-28 09:04:16 +00:00
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
|
|
|
|
|
index cc54ec0ef75c..33028d8f470e 100644
|
2018-12-28 09:04:16 +00:00
|
|
|
--- a/drivers/gpu/drm/i915/i915_trace.h
|
|
|
|
|
+++ b/drivers/gpu/drm/i915/i915_trace.h
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -683,7 +683,7 @@ DEFINE_EVENT(i915_request, i915_request_add,
|
2018-12-28 09:04:16 +00:00
|
|
|
TP_ARGS(rq)
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
-#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS)
|
|
|
|
|
+#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS) && !defined(NOTRACE)
|
|
|
|
|
DEFINE_EVENT(i915_request, i915_request_submit,
|
|
|
|
|
TP_PROTO(struct i915_request *rq),
|
|
|
|
|
TP_ARGS(rq)
|
