From patchwork Tue Feb 20 10:47:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10229777 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 08789602DC for ; Tue, 20 Feb 2018 10:47:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECB9A26E96 for ; Tue, 20 Feb 2018 10:47:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF23D26E4A; Tue, 20 Feb 2018 10:47:55 +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 56DC526E4A for ; Tue, 20 Feb 2018 10:47:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 408576E396; Tue, 20 Feb 2018 10:47:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 855476E396 for ; Tue, 20 Feb 2018 10:47:52 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id s5so13010817wra.0 for ; Tue, 20 Feb 2018 02:47:52 -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; bh=lcvgJVzZ9nSV/AYlTLXaXNxzpBbU7x8XtUY/6tdwKEQ=; b=qRvt0n9UgfckRYj2tWxfQiH6feiLNs9m5HvGjkRqrYZVzHIg8KDmdTKqEr2rbXvYCI gsfbu2CJ8GN+4TXGYFBjQg3VeS6kyDkm88n26o3p0Zj3duR5oXTjLQiS0fmySbX8DGi/ 9BQW/zIxIvC+tZj3QIJj7v/YFkqaLG4PQAuf4pKKJflwbU0IbO1HuSTK5x41RUrTTXE9 z2dT3V0pSvgChFYVrx5S4yMACDdV1AKcAm49PVlNIrLJn6xpQTWjG4cJ5AUgeq7ksEuV Ware7NM5rfNVw2i3AJEdLXgRSp5NnLRQLr7/zpuwTovI2VV8DSsi8N/KNiAsYU7q9THk jsIw== 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; bh=lcvgJVzZ9nSV/AYlTLXaXNxzpBbU7x8XtUY/6tdwKEQ=; b=AAlxPNjOtHmOzVij32hzSbGXauF2OcTrcGB+w6mx10Z4aBLxFxYUbXUzbpwJy8szkg FPhzgaz/UoFhMcraEjRXIKg4MeDNlyMW/wnZQXidOn7VWZHZdCq6GH6QEEJFb/6Sbz3V V6UkjZjR2Eyy678lIPl0aGA+0KokbS1+qGWCEbkBPTe4HkG+szgIJqNOqcWEzRZGNk5l ZDFA4I0RyOb+hJS7O4m1+XerCqSql1Rg5yqoHOvIiJ04cSPPwqiOiI02I1W+R+eJwQGX /w17izEJ6hkunYzdqBIn7g2YTjzhuCSaAuLve6NVagJU71khO/mLhwKzA+wJRr+IPqes m0Jg== X-Gm-Message-State: APf1xPBuZcGjy6hp8eI3K5zr/JxLMlj3enC+oc0ivDNflD7lRKROG3vK yn8pO2dXu3KQUlz16bDjamEXzA== X-Google-Smtp-Source: AH8x225mFQeX8JsKrvvq+BrXCYgJaMurz+tyMm3Oudy+pD+EAIRpdJBmsPeclffu801JbGursLwM2Q== X-Received: by 10.28.53.130 with SMTP id c124mr12321301wma.110.1519123671225; Tue, 20 Feb 2018 02:47:51 -0800 (PST) Received: from localhost.localdomain ([95.146.144.186]) by smtp.gmail.com with ESMTPSA id f23sm4925273wrf.77.2018.02.20.02.47.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2018 02:47:50 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 20 Feb 2018 10:47:42 +0000 Message-Id: <20180220104742.565-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.14.1 Subject: [Intel-gfx] [PATCH] drm/i915: Make global seqno known in i915_gem_request_execute tracepoint X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, Rodrigo Vivi MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Commit fe49789fab97 ("drm/i915: Deconstruct execute fence") re-arranged the code and moved the i915_gem_request_execute tracepoint to before the global seqno is assigned to the request. We need to move the tracepoint a bit later so this information is once again available. Signed-off-by: Tvrtko Ursulin Fixes: fe49789fab97 ("drm/i915: Deconstruct execute fence") Cc: Chris Wilson Cc: Tvrtko Ursulin Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem_request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index 8bc7c50b8418..0deca06fdf0e 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -490,8 +490,6 @@ void __i915_gem_request_submit(struct drm_i915_gem_request *request) GEM_BUG_ON(!irqs_disabled()); lockdep_assert_held(&engine->timeline->lock); - trace_i915_gem_request_execute(request); - /* Transfer from per-context onto the global per-engine timeline */ timeline = engine->timeline; GEM_BUG_ON(timeline == request->timeline); @@ -515,6 +513,8 @@ void __i915_gem_request_submit(struct drm_i915_gem_request *request) list_move_tail(&request->link, &timeline->requests); spin_unlock(&request->timeline->lock); + trace_i915_gem_request_execute(request); + wake_up_all(&request->execute); }