From patchwork Tue Feb 21 09:13:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9584131 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7787D600CA for ; Tue, 21 Feb 2017 09:14:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57AC8287EE for ; Tue, 21 Feb 2017 09:14:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CB7E288D9; Tue, 21 Feb 2017 09:14:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0A995287EE for ; Tue, 21 Feb 2017 09:14:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 606256E5EC; Tue, 21 Feb 2017 09:14:05 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB0E16E5E8 for ; Tue, 21 Feb 2017 09:14:03 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id v77so18511945wmv.0 for ; Tue, 21 Feb 2017 01:14:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tB9+WzP9e6sN5W0CPyUniw/Rc47y1zclwlw7+Y6Rd/4=; b=MMCgg76jRMW06tzzOhO+vOKRjJjIjeNG/3MKeB7CjtGOV/GYZ9GPU6KVViSVnZq2O0 jx6duOVPXnol+xfEg13rQ/ohkHh54lvanEGR9tdF+jTwOIuNHmkE2oEGoq4pxsK5XI6c 436r/wGAmhrkoChisOiq22UWLnYObj36vuolV9mchNaAfACYc+t0s5y6qipzvFEjDkQ9 +JP9+cFJcYGQ1fV+3u6YyPe2VJ9GAku4eQqjy4VBC1AVFsUUDqckyQAvZZqkRlnPELTB 66L4tE04YI/3DKp4Thna6bcAJ2QuWUbc2ja4VuyuTM8PAmGgOi0s0JPtpM0LQVNPd/lZ 8ssw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tB9+WzP9e6sN5W0CPyUniw/Rc47y1zclwlw7+Y6Rd/4=; b=q2wnQni2ZhqqmFlmuXVukkkNJcIiCE99Ueb6RIebmWqinnKqEpoGpQdah30GElQ7CL WK+QC1yQ9HKncktCvAYkrVKeear/FLklBOhmVR6zBLhBa/eaC7Wn9Z8yMnL9RvnCniWM GEpL5emSV62+7b0I6qRinmLQaEjGCCuKmyB6eHqp5Kf32m5unYhmlx/ZjCe2rJYvFPo2 /rzt0AhMpxWn1rGSjJIUMhp0WaPwlC0Pwu674ORi/iu/aIBCsDJ3940U9ITq4IJXE4ec fuOCiiIFiU9spJFvsFNOGV5NU7DvpNscXP3pDfUcuBPdQl62PbDO7Ek93vfLJRSxdcj1 evGA== X-Gm-Message-State: AMke39mXgIVxfVdp42qSc1b6Ild84V29/XH81XDauwLrkZ5xgliHrsQuodhT548V4JEbkg== X-Received: by 10.28.30.12 with SMTP id e12mr14345271wme.125.1487668442233; Tue, 21 Feb 2017 01:14:02 -0800 (PST) Received: from t460p.intel ([2.123.51.169]) by smtp.gmail.com with ESMTPSA id y89sm4046689wrc.23.2017.02.21.01.14.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Feb 2017 01:14:01 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 21 Feb 2017 09:13:45 +0000 Message-Id: <20170221091350.14605-3-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170221091350.14605-1-tvrtko.ursulin@linux.intel.com> References: <20170221091350.14605-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 3/8] drm/i915/tracepoints: Tidy i915_gem_request_wait_begin X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Provide the same information as the other request event classes. v2: Pass in flags so we can properly report the blocking status. (Chris Wilson) v3: Log hex with 0x prefix for clarity. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/i915_trace.h | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index a5fac40d2a4f..543cef57972b 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -1092,7 +1092,7 @@ long i915_wait_request(struct drm_i915_gem_request *req, if (!timeout) return -ETIME; - trace_i915_gem_request_wait_begin(req); + trace_i915_gem_request_wait_begin(req, flags); if (!i915_sw_fence_done(&req->execute)) { timeout = __i915_request_wait_for_execute(req, flags, timeout); diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index d9ade8c38f92..916aadbb5389 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -508,13 +508,16 @@ DEFINE_EVENT(i915_gem_request, i915_gem_request_complete, ); TRACE_EVENT(i915_gem_request_wait_begin, - TP_PROTO(struct drm_i915_gem_request *req), - TP_ARGS(req), + TP_PROTO(struct drm_i915_gem_request *req, unsigned int flags), + TP_ARGS(req, flags), TP_STRUCT__entry( __field(u32, dev) __field(u32, ring) + __field(u32, ctx) __field(u32, seqno) + __field(u32, global) + __field(unsigned int, flags) __field(bool, blocking) ), @@ -527,14 +530,16 @@ TRACE_EVENT(i915_gem_request_wait_begin, TP_fast_assign( __entry->dev = req->i915->drm.primary->index; __entry->ring = req->engine->id; - __entry->seqno = req->global_seqno; - __entry->blocking = - mutex_is_locked(&req->i915->drm.struct_mutex); + __entry->ctx = req->ctx->hw_id; + __entry->seqno = req->fence.seqno; + __entry->global = req->global_seqno; + __entry->flags = flags; + __entry->blocking = flags & I915_WAIT_LOCKED; ), - TP_printk("dev=%u, ring=%u, seqno=%u, blocking=%s", - __entry->dev, __entry->ring, - __entry->seqno, __entry->blocking ? "yes (NB)" : "no") + TP_printk("dev=%u, ring=%u, ctx=%u, seqno=%u, global=%u, blocking=%u, flags=0x%x", + __entry->dev, __entry->ring, __entry->ctx, __entry->seqno, + __entry->global, __entry->blocking, __entry->flags) ); DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_end,