Message ID | 1485518487-4464-7-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Jan 27, 2017 at 12:01:25PM +0000, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > i915_gem_ring_notify is more appropriate since we do not have > the request information at this point, but it is simply a > signal from the engine that some request has been completed. I was going to suggest intel_engine_notify. -Chris
On 27/01/2017 12:20, Chris Wilson wrote: > On Fri, Jan 27, 2017 at 12:01:25PM +0000, Tvrtko Ursulin wrote: >> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> >> i915_gem_ring_notify is more appropriate since we do not have >> the request information at this point, but it is simply a >> signal from the engine that some request has been completed. > > I was going to suggest intel_engine_notify. Yeah I know, but i915_trace.h seemed like a last remaining bastion of rings so I narrowly tipped to stick with it. But can change it just as well. Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 0ff75f2282fa..e16da1873be2 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1035,7 +1035,7 @@ static void notify_ring(struct intel_engine_cs *engine) { set_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted); if (intel_engine_wakeup(engine)) - trace_i915_gem_request_notify(engine); + trace_i915_gem_ring_notify(engine); } 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 1fe1417f8c4d..d24b89d0e3ab 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -606,7 +606,7 @@ trace_i915_gem_request_execute(struct drm_i915_gem_request *req) #endif #endif -TRACE_EVENT(i915_gem_request_notify, +TRACE_EVENT(i915_gem_ring_notify, TP_PROTO(struct intel_engine_cs *engine), TP_ARGS(engine),