From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniele.ceraolospurio@intel.com Subject: [PATCH 2/3] drm/i915: Add ctx param to i915_gem_ring_dispatch trace point Date: Tue, 1 Jul 2014 17:24:22 +0100 Message-ID: <1404231863-14127-2-git-send-email-daniele.ceraolospurio@intel.com> References: <1404231863-14127-1-git-send-email-daniele.ceraolospurio@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id E1DAA6E58C for ; Tue, 1 Jul 2014 09:25:00 -0700 (PDT) In-Reply-To: <1404231863-14127-1-git-send-email-daniele.ceraolospurio@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Daniele Ceraolo Spurio The context used to execute a batchbuffer is becoming increasingly important. Signed-off-by: Daniele Ceraolo Spurio --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_trace.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index d815ef5..0b2b76e 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1372,7 +1372,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, goto err; } - trace_i915_gem_ring_dispatch(ring, intel_ring_get_seqno(ring), flags); + trace_i915_gem_ring_dispatch(ring, intel_ring_get_seqno(ring), flags, ctx); i915_gem_execbuffer_move_to_active(&eb->vmas, ring); i915_gem_execbuffer_retire_commands(dev, file, ring, batch_obj); diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index 9be1421..4e73e3a 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -352,14 +352,16 @@ TRACE_EVENT(i915_gem_ring_sync_to, ); TRACE_EVENT(i915_gem_ring_dispatch, - TP_PROTO(struct intel_engine_cs *ring, u32 seqno, u32 flags), - TP_ARGS(ring, seqno, flags), + TP_PROTO(struct intel_engine_cs *ring, u32 seqno, u32 flags, + struct intel_context *ctx), + TP_ARGS(ring, seqno, flags, ctx), TP_STRUCT__entry( __field(u32, dev) __field(u32, ring) __field(u32, seqno) __field(u32, flags) + __field(struct i915_address_space *, vm) ), TP_fast_assign( @@ -367,11 +369,13 @@ TRACE_EVENT(i915_gem_ring_dispatch, __entry->ring = ring->id; __entry->seqno = seqno; __entry->flags = flags; + __entry->vm = ctx->vm; i915_trace_irq_get(ring, seqno); ), - TP_printk("dev=%u, ring=%u, seqno=%u, flags=%x", - __entry->dev, __entry->ring, __entry->seqno, __entry->flags) + TP_printk("dev=%u, ring=%u, seqno=%u, flags=%x, vm=%p", + __entry->dev, __entry->ring, __entry->seqno, + __entry->flags, __entry->vm) ); TRACE_EVENT(i915_gem_ring_flush, -- 1.8.5.2