From patchwork Mon Aug 1 09:10:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9254011 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 67CCB6089F for ; Mon, 1 Aug 2016 09:13:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58EA128496 for ; Mon, 1 Aug 2016 09:13:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D9E228405; Mon, 1 Aug 2016 09:13:53 +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 03B1028405 for ; Mon, 1 Aug 2016 09:13:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B93326E299; Mon, 1 Aug 2016 09:13:24 +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 A1C016E255 for ; Mon, 1 Aug 2016 09:12:34 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id i5so25263623wmg.2 for ; Mon, 01 Aug 2016 02:12:34 -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=C2hsOHIJX8r28pjszQi92FKwlOo1xs53LWy3f8PdzTE=; b=TAqQTBmPsYF8XBJ0nwAeklIzIjpR2XVuVl7wVZqg5kjiEY9gZ4evbvLv9tE602SzUo QR4AzIXHVNf2PUmgkpJv5/Z6Kcu8hooWztaz9f/4ALds844SJRI2qVRy9zVif2N7JKZx 4u/D3lXjnExY5xoFO4OCIJNzP1yxFN7mgx+aNtRUShBOjXE10XjzlYLxNMVqoZu9Idi1 G1UoDcpuF+wrgkV+6WAd792DdokfpxnJGOxxvJ3CiUsVWOXWrmysIXWOQNbQoqjSnhvX INtV+H1i/OcNIw3U0uGeNG/tgtNqkRNTUTOMCGbCg1BBHav++KEGOuGX9Ls1NMW2xeA+ OFGg== 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=C2hsOHIJX8r28pjszQi92FKwlOo1xs53LWy3f8PdzTE=; b=NdPEPRt+6+D4p1Gi6XdFteCAA9aumAcuoNIF0SarNq0M9VevKRpZrDrxldELVmgvoh bSmGSWJn/QtrisLKL/r/JfA42fTso7M0vH3WHrmQK1EEfw47u2H1Uw9bwL4RLmeEmb5F ICnT9ueeCU8TGkUQq4I/fvCPqpiN2ZRm72A23SXgt9A/5qymKqszxnWT/M1Oqnw8i07u 4pveAlJcclt9UuNm9HSmX8sYdEGvzrmxPdRNKQouInRwmfIl6MlQ7/+Ycd3lyBRQV9EA 66LxKhfInZROsnuoePKkEkLe9VE9tsbZBMlP3R952CzaAmjz1sZj4z7/bkW4+RdSqIDI i5Zg== X-Gm-Message-State: AEkoouvl2RdVabtXxXTIc4gy7mUCxJUEnFbQ+nPsJjx3fgl9Nj7RrgmYYfJCuGyEQNtFvQ== X-Received: by 10.28.186.138 with SMTP id k132mr12004688wmf.65.1470042750929; Mon, 01 Aug 2016 02:12:30 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id e10sm29514511wjc.21.2016.08.01.02.12.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Aug 2016 02:12:30 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 1 Aug 2016 10:10:51 +0100 Message-Id: <1470042681-25318-44-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1470042681-25318-1-git-send-email-chris@chris-wilson.co.uk> References: <1470042681-25318-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 43/73] drm/i915: Move request list retirement to i915_gem_request.c 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 As the list retirement is now clean of implementation details, we can move it closer to the request management. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem.c | 44 --------------------------------- drivers/gpu/drm/i915/i915_gem_request.c | 35 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d320d3711fa5..ac89c4c2008a 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2534,50 +2534,6 @@ void i915_gem_reset(struct drm_device *dev) i915_gem_restore_fences(dev); } -/** - * This function clears the request list as sequence numbers are passed. - * @engine: engine to retire requests on - */ -void -i915_gem_retire_requests_ring(struct intel_engine_cs *engine) -{ - while (!list_empty(&engine->request_list)) { - struct drm_i915_gem_request *request; - - request = list_first_entry(&engine->request_list, - struct drm_i915_gem_request, - link); - - if (!i915_gem_request_completed(request)) - break; - - i915_gem_request_retire_upto(request); - } -} - -void i915_gem_retire_requests(struct drm_i915_private *dev_priv) -{ - struct intel_engine_cs *engine; - - lockdep_assert_held(&dev_priv->drm.struct_mutex); - - if (dev_priv->gt.active_engines == 0) - return; - - GEM_BUG_ON(!dev_priv->gt.awake); - - for_each_engine(engine, dev_priv) { - i915_gem_retire_requests_ring(engine); - if (list_empty(&engine->request_list)) - dev_priv->gt.active_engines &= ~intel_engine_flag(engine); - } - - if (dev_priv->gt.active_engines == 0) - queue_delayed_work(dev_priv->wq, - &dev_priv->gt.idle_work, - msecs_to_jiffies(100)); -} - static void i915_gem_retire_work_handler(struct work_struct *work) { diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index 8549375aa75e..6faa84832ade 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -731,3 +731,38 @@ complete: return ret; } + +void i915_gem_retire_requests_ring(struct intel_engine_cs *engine) +{ + struct drm_i915_gem_request *request, *next; + + list_for_each_entry_safe(request, next, &engine->request_list, link) { + if (!i915_gem_request_completed(request)) + break; + + i915_gem_request_retire(request); + } +} + +void i915_gem_retire_requests(struct drm_i915_private *dev_priv) +{ + struct intel_engine_cs *engine; + + lockdep_assert_held(&dev_priv->drm.struct_mutex); + + if (dev_priv->gt.active_engines == 0) + return; + + GEM_BUG_ON(!dev_priv->gt.awake); + + for_each_engine(engine, dev_priv) { + i915_gem_retire_requests_ring(engine); + if (list_empty(&engine->request_list)) + dev_priv->gt.active_engines &= ~intel_engine_flag(engine); + } + + if (dev_priv->gt.active_engines == 0) + queue_delayed_work(dev_priv->wq, + &dev_priv->gt.idle_work, + msecs_to_jiffies(100)); +}