From patchwork Mon Mar 20 13:25:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9634197 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 91A89601E9 for ; Mon, 20 Mar 2017 13:26:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DACF2843A for ; Mon, 20 Mar 2017 13:26:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 723F92843C; Mon, 20 Mar 2017 13:26:10 +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 AE15F27F17 for ; Mon, 20 Mar 2017 13:26:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48F0C6E586; Mon, 20 Mar 2017 13:26:07 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id E3E3089295 for ; Mon, 20 Mar 2017 13:26:05 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id u132so14474562wmg.1 for ; Mon, 20 Mar 2017 06:26:05 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=iKBz+CrV+f7kwOpVCkDQwzZ4NU+mKiAuW7vMhi+l33M=; b=kXpL2odTAQzh5REbyEGNExeSJ3groLCLiZTIXHemv1272ko+kqlqE8cZkordpedzd2 2TIK3m9N+m5iUv8ZzV+XjSzY1s+Qw1DnXxv5rCq8dFsaKkFK0xees5yo3KeHhi8RR06z 0gsDEHnL4524ppCOEJCfp2qJcfvIF1aZRQyAq4gU1/meaZgDX52BmwxmJA2HPsZZTXMI aVeIcqF4KesYtPzl0bk/Wdn5SsVRftndX3C2ywZPjrQ3oBnXv4WmmCSqaFTuXtAHM5Aa /Y1Bpr8gAoUjvriondwasmKOjzaPkSpB5zs+IylrtSuuP6uY69Nx1z83QUZ5XMvDCaYL hhfQ== 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:mime-version :content-transfer-encoding; bh=iKBz+CrV+f7kwOpVCkDQwzZ4NU+mKiAuW7vMhi+l33M=; b=gaebfPCbjwdM3FkAwEfqFuJAsL/yeBRElHJsUOTBJ0ltI5/yCAeV6bDTYa348wKY6v ib1qRbimiHV8hTSYKOZFRoPOJ4kBOWIACDvk1O/5YqYbsGhxiNAy27ZGgfi3xF+nYHxT w0fJhBurmjNJno9KAwnZ9a7GBvGfhyZyuMTT0JHOZEzc+c1rW68cZ1YmxI1bxcux9+aJ onPNPpD15hvM2XcUXINPsquG6E1dalHZtCnOvRFwOrKbd+j411QPdAZiAYYTzvahES+C fgIYzPIGABvygWDr0Hdz9k7Rj4Mp5nUhnEW2Ib0ToZO3wkXQcyG67CS7azVS3ajm1dWS DEgA== X-Gm-Message-State: AFeK/H0nx6gjXgmVQWEX6IOLRWNTXF8/ylff7ywwvoajFJtFciw4GYiyesYZGOHhmqTcqg== X-Received: by 10.28.159.143 with SMTP id i137mr880371wme.128.1490016364556; Mon, 20 Mar 2017 06:26:04 -0700 (PDT) Received: from t460p.intel ([2.123.51.169]) by smtp.gmail.com with ESMTPSA id o22sm20072963wro.13.2017.03.20.06.26.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 06:26:04 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Mon, 20 Mar 2017 13:25:56 +0000 Message-Id: <20170320132556.29286-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Cc: intel-gfx@lists.freedesktop.org, Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915/guc: Correct the request_in tracepoint position 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin It has to be called after the global seqno has been assigned. Signed-off-by: Tvrtko Ursulin Fixes: 31de73501ac9 ("drm/i915/scheduler: emulate a scheduler for guc") Cc: Chris Wilson Cc: Tvrtko Ursulin Cc: Joonas Lahtinen Cc: Michał Winiarski Cc: Daniel Vetter Cc: Jani Nikula Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index 4514168c55f3..67fa6fdfad77 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -597,8 +597,8 @@ static bool i915_guc_dequeue(struct intel_engine_cs *engine) RB_CLEAR_NODE(&rq->priotree.node); rq->priotree.priority = INT_MAX; - trace_i915_gem_request_in(rq, port - engine->execlist_port); i915_guc_submit(rq); + trace_i915_gem_request_in(rq, port - engine->execlist_port); last = rq; submit = true; }