From patchwork Tue Feb 21 09:13:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9584139 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 E34CF600CA for ; Tue, 21 Feb 2017 09:14:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C33F5287EE for ; Tue, 21 Feb 2017 09:14:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8237288D9; Tue, 21 Feb 2017 09:14:11 +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 7518F287EE for ; Tue, 21 Feb 2017 09:14:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB7756E5F8; Tue, 21 Feb 2017 09:14:10 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C16296E5F5 for ; Tue, 21 Feb 2017 09:14:06 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id q39so14445568wrb.2 for ; Tue, 21 Feb 2017 01:14:06 -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=uK0gKftIZbm6tIoBUDzKssbhp7iX6lyf2UfoBxaJxv0=; b=XIs1HvyHM7UVE13FGnavI9utQelDzeQfIn0MBY1PwwhmDTl9NImKIitZTgUaXQWJDh e3k13ZKbL4jXNN3GUUSvB/AiQh/RcOSPk3X94tBwOebaCDiCi+ZcgZScdjXtF3q9/OoI 0e7GW92xrIQmcZ/2A89F8yyvJTsXaXjmo8hAJV0V+FlUhf+TlF3UyTUE4RdmXdjMsonr gMootKZMNEtBrQiSG970fl8/Yfxew7BoXvPDKMdLak3pNuit7Yy29QwaYRHOyp6QaM7T Ea+2miJYKyprRkgdHizXFc/oT9S0WV92Ix+WY4raG1I3DjrP2hEkwLOZztU4JDkStgAr 17ZQ== 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=uK0gKftIZbm6tIoBUDzKssbhp7iX6lyf2UfoBxaJxv0=; b=NZNp+3cIJNKIsASgwwMWLDJ3VOuEx66PSpnnic4B5naI2QPhYU+ioEMYiJH7vvzxsj P16pBb8u9E+KZep4OHs/l2P2RusBQ2441iJurer/b/VZqsbavMz0Ug7ZVatmKQIA+hWJ NQe0PurgMHxJEHYFaYjfbQQJPBMaAfmWRBG9/A6T96Wsu79chospDb2r4rhoHgbPMXmo UG+Bbq59ZkUox9k/QRGX5/u5AL7VEXAPIE6WC49e7aZMGOc33izd4jZtjDaebX5ooxsR WX/YuqqFoDoHLNiQt1x8rzz9rJJsSbfY1OKvsPInxL1B9OzaTIN7yjGLqG9t24Ovc8Sq r6GA== X-Gm-Message-State: AMke39ndZzIB82LCNDXVWOEAaw1H5CgRsOs8TxmBdxMsNHxT8hWow0FQEBPkGiFILxyxeQ== X-Received: by 10.223.160.206 with SMTP id n14mr19306371wrn.31.1487668445206; Tue, 21 Feb 2017 01:14:05 -0800 (PST) Received: from t460p.intel ([2.123.51.169]) by smtp.gmail.com with ESMTPSA id y89sm4046689wrc.23.2017.02.21.01.14.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Feb 2017 01:14:04 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 21 Feb 2017 09:13:48 +0000 Message-Id: <20170221091350.14605-6-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 6/8] drm/i915/tracepoints: Rename i915_gem_request_notify 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 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. v2: * Always trace and log if there were any waiters. * Rename to intel_engine_notify. (Chris Wilson) Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_irq.c | 6 ++++-- drivers/gpu/drm/i915/i915_trace.h | 13 ++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 57fa1bf78a85..bc70e2c451b2 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1033,10 +1033,12 @@ static void ironlake_rps_change_irq_handler(struct drm_i915_private *dev_priv) static void notify_ring(struct intel_engine_cs *engine) { + bool waiters; + atomic_inc(&engine->irq_count); set_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted); - if (intel_engine_wakeup(engine)) - trace_i915_gem_request_notify(engine); + waiters = intel_engine_wakeup(engine); + trace_intel_engine_notify(engine, waiters); } 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 ec523fdde01b..e6bb342a8c60 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -501,24 +501,27 @@ trace_i915_gem_request_execute(struct drm_i915_gem_request *req) #endif #endif -TRACE_EVENT(i915_gem_request_notify, - TP_PROTO(struct intel_engine_cs *engine), - TP_ARGS(engine), +TRACE_EVENT(intel_engine_notify, + TP_PROTO(struct intel_engine_cs *engine, bool waiters), + TP_ARGS(engine, waiters), TP_STRUCT__entry( __field(u32, dev) __field(u32, ring) __field(u32, seqno) + __field(bool, waiters) ), TP_fast_assign( __entry->dev = engine->i915->drm.primary->index; __entry->ring = engine->id; __entry->seqno = intel_engine_get_seqno(engine); + __entry->waiters = waiters; ), - TP_printk("dev=%u, ring=%u, seqno=%u", - __entry->dev, __entry->ring, __entry->seqno) + TP_printk("dev=%u, ring=%u, seqno=%u, waiters=%u", + __entry->dev, __entry->ring, __entry->seqno, + __entry->waiters) ); DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,