drm/i915: Remove the intel_engine_notify tracepoint

The global seqno is defunct and so we have no meaningful indicator of
forward progress for an engine. You need to listen to the request
signaling tracepoints instead.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190129205230.19056-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 26ab00862b5938a9062d6f5b71356ce7212fc3a1..0fcdb14c50f496588ed28e6e4b0ec0d2f4cb0231 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1227,8 +1227,6 @@ static void notify_ring(struct intel_engine_cs *engine)
                wake_up_process(tsk);
 
        rcu_read_unlock();
-
-       trace_intel_engine_notify(engine, wait);
 }
 
 static void vlv_c0_read(struct drm_i915_private *dev_priv,

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 33d90eca9cdd18e1422614348df8d24e07ccca6c..cb5bc65d575d70cabda2edf33738d4526dfb2157 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -750,31 +750,6 @@ trace_i915_request_out(struct i915_request *rq)
 #endif
 #endif
 
-TRACE_EVENT(intel_engine_notify,
-           TP_PROTO(struct intel_engine_cs *engine, bool waiters),
-           TP_ARGS(engine, waiters),
-
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            __field(u16, class)
-                            __field(u16, instance)
-                            __field(u32, seqno)
-                            __field(bool, waiters)
-                            ),
-
-           TP_fast_assign(
-                          __entry->dev = engine->i915->drm.primary->index;
-                          __entry->class = engine->uabi_class;
-                          __entry->instance = engine->instance;
-                          __entry->seqno = intel_engine_get_seqno(engine);
-                          __entry->waiters = waiters;
-                          ),
-
-           TP_printk("dev=%u, engine=%u:%u, seqno=%u, waiters=%u",
-                     __entry->dev, __entry->class, __entry->instance,
-                     __entry->seqno, __entry->waiters)
-);
-
 DEFINE_EVENT(i915_request, i915_request_retire,
            TP_PROTO(struct i915_request *rq),
            TP_ARGS(rq)