From patchwork Mon Jul 25 17:32:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9246233 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 29256607F2 for ; Mon, 25 Jul 2016 17:42:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D2F620587 for ; Mon, 25 Jul 2016 17:42:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1213E26C9B; Mon, 25 Jul 2016 17:42:32 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9A2B20587 for ; Mon, 25 Jul 2016 17:42:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C67BA6E3C7; Mon, 25 Jul 2016 17:42:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F9536E3C1 for ; Mon, 25 Jul 2016 17:41:16 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id x83so17689152wma.3 for ; Mon, 25 Jul 2016 10:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=B5ztByhOnRnW1FBb+n4ieOdXncOvl1KrVRTnrcv8Av8=; b=q1YH4ctlZwlQqFPc6wvtFYFJ8MwqGB74N3eHawEqoXOaFfoUN5M+Ulw5XU/tTQngOG AFPvoOSiKbMCyrKUOElDJEePzkzHPGJK6jUm7C8Ef6mWZsseYfymELdJjagfjT2U0LSf RUIMF8bnIirn7jSr0inSPaNdnp6x6B5Gsmr+Spt5cXJ44NDjR/60J8guuFvwLEIge5p6 B7jqe0BgT96CA2Y95Vj4856Cy1To6eLOFo18E0j0dNMBGu8EiTBpdX08195AMzhM1w29 KwuxzKgPRGX8QE/T3Ve0wIWpb1mTx5xI63EOZXkG6vYrKruI07W7SdpFPIzIQSm7iqvd FMkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=B5ztByhOnRnW1FBb+n4ieOdXncOvl1KrVRTnrcv8Av8=; b=Sm7B1lEQ/9UtXkz+9bm84cuH724C+sCHB3g607XyOfwlVbUdm5f2DlPJXdLGE9R668 aTmN3zKsRzOyUhV4rgYv9OK9Iq8vzAYDiCWlujTiRSdUdXYSTJTm2dqrYqEAg1WJHpFX uONCuqIP69nC22CPQFeUvIQ+c3wHampRqvTd4wTWT7BS3K5WPKgsIOpdltsine4yCJxm nLj4M6ZsNLJDwEJ/LL9/SRgo7gpRkW1fBFRFl2qbbQJ9Gv/bmQOBaS6PmfKcEKwhtk7V BJhnUtGop8dok4f4nOZJhVSGcm4NLJenmZ3/ItXPdbRw5veAWL72NmS1Lr4VAI0wh5A3 4A2A== X-Gm-Message-State: AEkoousCseCQtttvHO07rpc6U3YFcCfxJK2uXlup/7q8f0WNFwNg2gjEOLayJW57WwyZfQ== X-Received: by 10.28.198.6 with SMTP id w6mr5290828wmf.63.1469468473748; Mon, 25 Jul 2016 10:41:13 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 190sm20531746wmk.13.2016.07.25.10.41.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jul 2016 10:41:12 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 25 Jul 2016 18:32:25 +0100 Message-Id: <1469467954-3920-47-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1469467954-3920-1-git-send-email-chris@chris-wilson.co.uk> References: <1469467954-3920-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 46/55] drm/i915: Move the special case wait-request handling to its one caller 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 Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem_request.c | 25 ------------------------- drivers/gpu/drm/i915/i915_gem_request.h | 4 ---- drivers/gpu/drm/i915/intel_ringbuffer.c | 18 +++++++++++++----- 3 files changed, 13 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index f1c37b7891cb..2c0c6a37f46a 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -716,28 +716,3 @@ complete: return ret; } - -/** - * Waits for a request to be signaled, and cleans up the - * request and object lists appropriately for that event. - */ -int i915_wait_request(struct drm_i915_gem_request *req) -{ - int ret; - - lockdep_assert_held(&req->i915->drm.struct_mutex); - GEM_BUG_ON(list_empty(&req->link)); - - ret = __i915_wait_request(req, - req->i915->mm.interruptible, - NULL, - NULL); - if (ret) - return ret; - - /* If the GPU hung, we want to keep the requests to find the guilty. */ - if (!i915_reset_in_progress(&req->i915->gpu_error)) - i915_gem_request_retire_upto(req); - - return 0; -} diff --git a/drivers/gpu/drm/i915/i915_gem_request.h b/drivers/gpu/drm/i915/i915_gem_request.h index b1ee37896feb..f4aab8e60c9e 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.h +++ b/drivers/gpu/drm/i915/i915_gem_request.h @@ -220,10 +220,6 @@ int __i915_wait_request(struct drm_i915_gem_request *req, struct intel_rps_client *rps) __attribute__((nonnull(1))); -int __must_check -i915_wait_request(struct drm_i915_gem_request *req) - __attribute__((nonnull)); - static inline u32 intel_engine_get_seqno(struct intel_engine_cs *engine); /** diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index af76869c8db2..507576ef8077 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2284,6 +2284,7 @@ static int wait_for_space(struct drm_i915_gem_request *req, int bytes) { struct intel_ring *ring = req->ring; struct drm_i915_gem_request *target; + int ret; intel_ring_update_space(ring); if (ring->space >= bytes) @@ -2313,7 +2314,18 @@ static int wait_for_space(struct drm_i915_gem_request *req, int bytes) if (WARN_ON(&target->ring_link == &ring->request_list)) return -ENOSPC; - return i915_wait_request(target); + ret = __i915_wait_request(target, true, NULL, NULL); + if (ret) + return ret; + + if (i915_reset_in_progress(&target->i915->gpu_error)) + return -EAGAIN; + + i915_gem_request_retire_upto(target); + + intel_ring_update_space(ring); + GEM_BUG_ON(ring->space < bytes); + return 0; } int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords) @@ -2351,10 +2363,6 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords) int ret = wait_for_space(req, wait_bytes); if (unlikely(ret)) return ret; - - intel_ring_update_space(ring); - if (unlikely(ring->space < wait_bytes)) - return -EAGAIN; } if (unlikely(need_wrap)) {