From patchwork Thu May 5 09:15:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9022201 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 06F7DBF440 for ; Thu, 5 May 2016 09:16:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8405F203F3 for ; Thu, 5 May 2016 09:16:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BC552203B8 for ; Thu, 5 May 2016 09:16:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 884F86E95F; Thu, 5 May 2016 09:16:22 +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 B5FA16E965 for ; Thu, 5 May 2016 09:16:19 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id e201so2341998wme.2 for ; Thu, 05 May 2016 02:16:19 -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=PIQRzVAWHUH81mhM+bjeC094sU+d+NGdeoiB8fZY33k=; b=mdUPlGDGd2+uC3tWtWNG3xJosU+mDeG0WogIbQroNPP0b1fphYbPSapJnI/jFc0hJn JCf+ztNQ2mjO+Su92Udqcriii0oyxktEasIAecPtZRTUSdCIFcWBGti9SjQxiG12/whI 2PmmgyhGm4C+KtVhkt275krjK2By/YfoWZSJBJrfNkvVhFoMRPdR/R3rID3cIrm3Zk7w 5ryTawOQZ2DocsF2FIWUKVHbQNP2ZtoqPS7AZwJBE0rdCAkE1b+nO5HyHSwvEMOkzeYs OvILuGaAAtEj7+weg/jRHkId7T4bRpj/NF0m+EtbpYJQlnKSbvp0Scvd/ZCB6smA9alN i2PA== 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=PIQRzVAWHUH81mhM+bjeC094sU+d+NGdeoiB8fZY33k=; b=ChfnXc7Dzp4zoMpW8vPW0/ZCltKm2KqUqXnvQI5Cjf/dgLgfO4ZWxYpPXi96jcJoXy h0TrrGFsI+1/FCCG2bObGk8H9+tlQsWRabMcN6oX68FlT3M/dNBjSx+wple8uVFbZE/H e+ztrM+TA94hMKuOrvOsnOZEfzpp3FzdhZmuuDoPkP/gZVBpcaSImmjWyG6HbIdKsR+7 yzZcHICx5K0630flME8tQ2wtH2IaDVSjqGwHQzKeMf1Ujx7SQTB1gyaRh2ZKOCOqv+KC wetwo2K3OAo/ZpgyILvO+6ZQpUl5BQHaH4+EpeQNPNFFdqt1CzUBOuAGihcRIPDl7Ukl 4D4A== X-Gm-Message-State: AOPr4FVLvEe6cqHZC6/ZCivpCKgout4PQOK+6Qn8ZDcHNwktwxK6DTjsDRAGg5heeAZTWg== X-Received: by 10.28.48.145 with SMTP id w139mr2113831wmw.51.1462439778353; Thu, 05 May 2016 02:16:18 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id s6sm8727063wjy.31.2016.05.05.02.16.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 May 2016 02:16:17 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 5 May 2016 10:15:53 +0100 Message-Id: <1462439768-8615-4-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1462439768-8615-1-git-send-email-chris@chris-wilson.co.uk> References: <1462439768-8615-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 04/19] drm/i915/shrinker: Flush active on objects before counting 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-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As we inspect obj->active to decide how many objects we can shrink (we only shrink idle objects), it helps to flush the active lists first in order to have a more accurate count of available objects. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c index 538c30499848..d893014d28fe 100644 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -265,6 +265,8 @@ i915_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) if (!i915_gem_shrinker_lock(dev, &unlock)) return 0; + i915_gem_retire_requests(dev_priv); + count = 0; list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) if (can_release_pages(obj))