From patchwork Fri Dec 23 14:57:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9487487 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 6BD35601D7 for ; Fri, 23 Dec 2016 14:58:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55B1123B3D for ; Fri, 23 Dec 2016 14:58:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4949125D9E; Fri, 23 Dec 2016 14:58:16 +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 D785D23B3D for ; Fri, 23 Dec 2016 14:58:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14EC86E06B; Fri, 23 Dec 2016 14:58:14 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1FA8B6E069 for ; Fri, 23 Dec 2016 14:58:12 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m203so41933723wma.3 for ; Fri, 23 Dec 2016 06:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=SSS7i/ioc2bdRD/M4seb0/AOmW6UtzOog01AcB7u8Z8=; b=gDjw1L5OZqQ1iJ82LUslzvyRValLQJQiGT0t6xf3p7pngTvK5DzdpozCVBKQTMWm05 QAIdu8lVcOltR8XetKaM3pUhIZG4ZQuIGj0r7kHfROKwQOLSBo1MDDemQATS7+9wTxwY BF8fKJ+d6zVrDMR5X8G7TCDb3MlEIbW3J9h/qggIpqZbyZrRKFUC/+gdqXLbOvr7RFYy E/aFKMhNzfgGaKBrGoR7TOHU7YF3ugd/P9bsubGCAtEIm7KEpK1kmiI+qGKzQvRu5l4Y 7rYKsxrjzaMYfdnE8BaGa33u9LJXHeG3S+k0Xn47dfL09SAPnQbM9//3PUZsjx74faDI 5cBg== 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; bh=SSS7i/ioc2bdRD/M4seb0/AOmW6UtzOog01AcB7u8Z8=; b=TaB3GRxCeEHinuhik1kbifqv9OHagufrClJHJKybzWJyQJmqauHEwN39DSiv9a0AYl 9JXtMzlCkspwwXzmjOe8r+jLil+bYurpWrPNxYwHInwqWhg+Rs743rKr6R875tkFhdXc W5//V69fImUJudYbfqeI92km6LspW25aGX0Ms1jQyI9NaJ4aIeneCTGuaH25dUqAzkRb zyu9K0uqQ2aQh6dueshAQaf3z6GFtJ/cj8Xb3pO302Cyyxda2S2QpX5iofa7G8KlsXhh 03zKvPjQZ9QjF1UibtFsh4XGfmLX3D4cjtEkQn4zs9WXNGlifxpoj5cgEoYRMlsSkg52 iyBQ== X-Gm-Message-State: AIkVDXJkuGeE+4fHpPgzJdRZwyjdFta1S7302SjzJJTrNi/rH/DqFcsjZwN4ohvegLwJiA== X-Received: by 10.28.229.72 with SMTP id c69mr15326592wmh.110.1482505089850; Fri, 23 Dec 2016 06:58:09 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id i15sm40786462wjs.16.2016.12.23.06.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2016 06:58:09 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 23 Dec 2016 14:57:55 +0000 Message-Id: <20161223145804.6605-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH 01/10] drm/i915: Break after walking all GGTT vma in bump_inactive_ggtt 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 Since commit db6c2b4151f2 ("drm/i915: Store the vma in an rbtree under the object") the vma are once again sorted into GGTT first, then ppGTT so that the typical case of walking the GGTT vma can stop as soon as we find a non-ppGTT. Apply that optimisation. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Joonas Lahtinen Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 613a92414a00..5a08e8c187e8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1515,7 +1515,7 @@ static void i915_gem_object_bump_inactive_ggtt(struct drm_i915_gem_object *obj) list_for_each_entry(vma, &obj->vma_list, obj_link) { if (!i915_vma_is_ggtt(vma)) - continue; + break; if (i915_vma_is_active(vma)) continue;