leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/tracepoints: Adjust i915_gem_ring_dispatch

Browse Source 
Rename it to i915_gem_request_queue and fix the logged info
equivalent to the i915_gem_request even class. Also moved it
a bit further apart from the i915_gem_request_add tracepoint
since they otherwise provide similar information too close in
time.

v2: Remove sw fence singalling. We will rely on the soon to
    come GuC scheduling backend to enable that. (Chris Wilson)

v3: Log hex with 0x prefix for clarity.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Tvrtko Ursulin 2017-02-21 09:13:44 +00:00
parent e235b53019
commit 1cce8922df
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_gem_execbuffer.c
View File

@ -1493,8 +1493,6 @@ execbuf_submit(struct i915_execbuffer_params *params,
if (ret) if (ret)
return ret; return ret;
trace_i915_gem_ring_dispatch(params->request, params->dispatch_flags);
i915_gem_execbuffer_move_to_active(vmas, params->request); i915_gem_execbuffer_move_to_active(vmas, params->request);
return 0; return 0;
@ -1836,6 +1834,8 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
params->dispatch_flags = dispatch_flags; params->dispatch_flags = dispatch_flags;
params->ctx = ctx; params->ctx = ctx;
trace_i915_gem_request_queue(params->request, dispatch_flags);
ret = execbuf_submit(params, args, &eb->vmas); ret = execbuf_submit(params, args, &eb->vmas);
err_request: err_request:
__i915_add_request(params->request, ret == 0); __i915_add_request(params->request, ret == 0);

12
drivers/gpu/drm/i915/i915_trace.h
View File

@ -399,13 +399,14 @@ TRACE_EVENT(i915_gem_ring_sync_to,
__entry->seqno) __entry->seqno)
); );
TRACE_EVENT(i915_gem_ring_dispatch, TRACE_EVENT(i915_gem_request_queue,
TP_PROTO(struct drm_i915_gem_request *req, u32 flags), TP_PROTO(struct drm_i915_gem_request *req, u32 flags),
TP_ARGS(req, flags), TP_ARGS(req, flags),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(u32, dev) __field(u32, dev)
__field(u32, ring) __field(u32, ring)
__field(u32, ctx)
__field(u32, seqno) __field(u32, seqno)
__field(u32, flags) __field(u32, flags)
), ),
@ -413,13 +414,14 @@ TRACE_EVENT(i915_gem_ring_dispatch,
TP_fast_assign( TP_fast_assign(
__entry->dev = req->i915->drm.primary->index; __entry->dev = req->i915->drm.primary->index;
__entry->ring = req->engine->id; __entry->ring = req->engine->id;
__entry->seqno = req->global_seqno; __entry->ctx = req->ctx->hw_id;
__entry->seqno = req->fence.seqno;
__entry->flags = flags; __entry->flags = flags;
dma_fence_enable_sw_signaling(&req->fence);
), ),
TP_printk("dev=%u, ring=%u, seqno=%u, flags=%x", TP_printk("dev=%u, ring=%u, ctx=%u, seqno=%u, flags=0x%x",
__entry->dev, __entry->ring, __entry->seqno, __entry->flags) __entry->dev, __entry->ring, __entry->ctx, __entry->seqno,
__entry->flags)
); );
TRACE_EVENT(i915_gem_ring_flush, TRACE_EVENT(i915_gem_ring_flush,