diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 2cf99c436658..9ae7f77293a0 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c | |||
@@ -446,11 +446,12 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) | |||
446 | desc = execlists_update_context(rq); | 446 | desc = execlists_update_context(rq); |
447 | GEM_DEBUG_EXEC(port[n].context_id = upper_32_bits(desc)); | 447 | GEM_DEBUG_EXEC(port[n].context_id = upper_32_bits(desc)); |
448 | 448 | ||
449 | GEM_TRACE("%s in[%d]: ctx=%d.%d, global=%d (fence %llx:%lld) (current %d), prio=%d\n", | 449 | GEM_TRACE("%s in[%d]: ctx=%d.%d, global=%d (fence %llx:%lld) (current %d:%d), prio=%d\n", |
450 | engine->name, n, | 450 | engine->name, n, |
451 | port[n].context_id, count, | 451 | port[n].context_id, count, |
452 | rq->global_seqno, | 452 | rq->global_seqno, |
453 | rq->fence.context, rq->fence.seqno, | 453 | rq->fence.context, rq->fence.seqno, |
454 | hwsp_seqno(rq), | ||
454 | intel_engine_get_seqno(engine), | 455 | intel_engine_get_seqno(engine), |
455 | rq_prio(rq)); | 456 | rq_prio(rq)); |
456 | } else { | 457 | } else { |
@@ -742,11 +743,12 @@ execlists_cancel_port_requests(struct intel_engine_execlists * const execlists) | |||
742 | while (num_ports-- && port_isset(port)) { | 743 | while (num_ports-- && port_isset(port)) { |
743 | struct i915_request *rq = port_request(port); | 744 | struct i915_request *rq = port_request(port); |
744 | 745 | ||
745 | GEM_TRACE("%s:port%u global=%d (fence %llx:%lld), (current %d)\n", | 746 | GEM_TRACE("%s:port%u global=%d (fence %llx:%lld), (current %d:%d)\n", |
746 | rq->engine->name, | 747 | rq->engine->name, |
747 | (unsigned int)(port - execlists->port), | 748 | (unsigned int)(port - execlists->port), |
748 | rq->global_seqno, | 749 | rq->global_seqno, |
749 | rq->fence.context, rq->fence.seqno, | 750 | rq->fence.context, rq->fence.seqno, |
751 | hwsp_seqno(rq), | ||
750 | intel_engine_get_seqno(rq->engine)); | 752 | intel_engine_get_seqno(rq->engine)); |
751 | 753 | ||
752 | GEM_BUG_ON(!execlists->active); | 754 | GEM_BUG_ON(!execlists->active); |
@@ -970,12 +972,13 @@ static void process_csb(struct intel_engine_cs *engine) | |||
970 | EXECLISTS_ACTIVE_USER)); | 972 | EXECLISTS_ACTIVE_USER)); |
971 | 973 | ||
972 | rq = port_unpack(port, &count); | 974 | rq = port_unpack(port, &count); |
973 | GEM_TRACE("%s out[0]: ctx=%d.%d, global=%d (fence %llx:%lld) (current %d), prio=%d\n", | 975 | GEM_TRACE("%s out[0]: ctx=%d.%d, global=%d (fence %llx:%lld) (current %d:%d), prio=%d\n", |
974 | engine->name, | 976 | engine->name, |
975 | port->context_id, count, | 977 | port->context_id, count, |
976 | rq ? rq->global_seqno : 0, | 978 | rq ? rq->global_seqno : 0, |
977 | rq ? rq->fence.context : 0, | 979 | rq ? rq->fence.context : 0, |
978 | rq ? rq->fence.seqno : 0, | 980 | rq ? rq->fence.seqno : 0, |
981 | rq ? hwsp_seqno(rq) : 0, | ||
979 | intel_engine_get_seqno(engine), | 982 | intel_engine_get_seqno(engine), |
980 | rq ? rq_prio(rq) : 0); | 983 | rq ? rq_prio(rq) : 0); |
981 | 984 | ||