From patchwork Thu Mar 30 14:50:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9654347 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 5567A60349 for ; Thu, 30 Mar 2017 14:50:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47B0728512 for ; Thu, 30 Mar 2017 14:50:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CCF428515; Thu, 30 Mar 2017 14:50: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 0911B28512 for ; Thu, 30 Mar 2017 14:50:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 492A16E8F3; Thu, 30 Mar 2017 14:50:53 +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 82D706E8EC for ; Thu, 30 Mar 2017 14:50:50 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id k6so11545946wre.3 for ; Thu, 30 Mar 2017 07:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=g63MZbUV1qmURQWCIyHlgmrqkfId3ysZVx4+oN+Dq0s=; b=JeL1A2TTwdLtXm/Obxkgal3iunhnMa42ZTQWRclYCy4YrkThRcgB9OvFwd9i0ZtWDe 1Bg48Z9C2t6AkAJyhVCr6prZiJiRo8OGsPXH878G9M5k8z/Q3zNHEWC9XUNBbThB8pcg abKY3wCRsGdjQxG0sW8VyXvEXg60fYHoCy39o81QgELjziblIeE1WaIFwnVrpr8JL2Bp RKzetMdyiq1EdNwUWLqWkCcZDNwDPlZkU+X0SLntlUW7Nm57EfYqks3QV3mrbB53/oSk q7WnB0m3QsNR5EZ0dcd9WANVkKb1NKCPeeQ/YPWNQAtKQ0JFjHAzsqp8+it9qgBcmv6m LiuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=g63MZbUV1qmURQWCIyHlgmrqkfId3ysZVx4+oN+Dq0s=; b=HS9HvaY7Qc6NxxAbnRa/oWRsv4cAcU89CkJqPRLdhyWbY5XUT+d6HT/nSxErlh2ypY Dw8HP8HdgYxqKmfPqCXqJLpqmitaRc9FQtkH/1fQ/7XPp9GzLXgzKe2iYwRvsskB5VQD NQkvFzBWRlo5ZzdP8xtbHZQa4Oxh34LEByPM6Xovhz+i+6AAfgqeQkaYtVBoWaddo5RR KFdaV4WovNlqVQvy2XNpo3AT3AXX/UHIy7nl10Fer/OAFPTzm+1elmr1+OMRb9zuskAq Chbwew6hxACBhJMRbYtbJkZtEb7xh5L0hHVbFfb2z9tMUSTNUfptbcAK16fgylnwq6VO v5mw== X-Gm-Message-State: AFeK/H0mVvSWoKZLzuBXtGOahHFUU5Mkxf2nOxBxLaKM+UpfwhapuY3ZfynvBq1cJoQ16g== X-Received: by 10.28.203.204 with SMTP id b195mr3918306wmg.51.1490885448906; Thu, 30 Mar 2017 07:50:48 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id v29sm3055230wrv.66.2017.03.30.07.50.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 07:50:47 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 30 Mar 2017 15:50:40 +0100 Message-Id: <20170330145041.9005-5-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170330145041.9005-1-chris@chris-wilson.co.uk> References: <20170330145041.9005-1-chris@chris-wilson.co.uk> Cc: mika.kuoppala@intel.com Subject: [Intel-gfx] [PATCH 5/6] drm/i915: Remove redudant wait for each engine to idle from seqno wrap 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 Having added the wait upon each engine to idle into the central i915_gem_wait_for_idle(), we can remove the now redundant wait from reset_all_global_seqno(). This has the advantage of removing the late detection of an error (an engine still busy) which left the seqno reset only partially complete (though it should be safe enough!). Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_request.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index f16900848650..1bfc3e664470 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -207,9 +207,6 @@ static int reset_all_global_seqno(struct drm_i915_private *i915, u32 seqno) for_each_engine(engine, i915, id) { struct intel_timeline *tl = &timeline->engine[id]; - if (wait_for(intel_engine_is_idle(engine), 50)) - return -EBUSY; - if (!i915_seqno_passed(seqno, tl->seqno)) { /* spin until threads are complete */ while (intel_breadcrumbs_busy(engine))