From patchwork Mon Jul 25 17:32:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9246187 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 B8745607F2 for ; Mon, 25 Jul 2016 17:39:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABD1B20587 for ; Mon, 25 Jul 2016 17:39:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0A2026CF9; Mon, 25 Jul 2016 17:39:24 +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 3B24120587 for ; Mon, 25 Jul 2016 17:39:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EAD736E3B1; Mon, 25 Jul 2016 17:39:18 +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 C7C126E3B1 for ; Mon, 25 Jul 2016 17:38:39 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id i5so17725824wmg.2 for ; Mon, 25 Jul 2016 10:38:39 -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=ER3gSjekeuk8t51beCCpnqFPpzAOKmEwIpAa1rlTzNY=; b=twZdssZfHgspaIBywUps3SuQwvPXM/cAr1H9+66mKn7FiY0l1LjxSLaKcyNW7/APeH 1p4Mqa3tKt+2dfCvlmhjzkym8ukMe3+1Syc6yn+ZhZGRVJ/dKg2SyAFa+QaWR52FrFVF irdy6ZaNMD1jf0h++3YDUTOsaqEE+SPp9EoqG63/5C+TTEHLlIDK5uAN90VBU66bJ9+k zoflfzFsXds6hNkD4ZANQ3EOdDuMOkWcnz4u/akJJMbynlF4djrGRUlHgyh2GzOyUvjB Ho6D5N7SAkMM8Bbq047T473Fg8WrBBG+DeWjjI8HpxMajbrMnWhNi/fJNeHbc7f1TGeS Zb/A== 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=ER3gSjekeuk8t51beCCpnqFPpzAOKmEwIpAa1rlTzNY=; b=mLr/0vQJCPK4ADC1qySiPzhHTsu2fTqSeOLbdTvo0+SnzlmYGViiI/PUfk95HPeSRk JekXitscIPaSlID7XyituB1eM17cERn8c/H1o4szmNLrnHKrewfW3ciZ+AdBSlVRXdrY bPr0atFOtegadPeIe2kYAL6J91/5ByF8pGfzIAtfW/Quk60dVE0NNhvRn6qtDYD7ji4h zJEcBB5TvL9sYL/U3vx8T2O+M6tmDuRn8BMujSLJS1pPk00lVGfVmUgpsQHGSh+kmR5t b85/hT+c//WUP7PG8fBm7YTndpxku87s2g9WRy+jOvynLVrcEg0ecdNe+c7knNEDPYrC 5VZQ== X-Gm-Message-State: ALyK8tLaVnsqloUP4XwMiGxRT+liquBAyeZtGlR+LCoNFxtSfoYjoZIQmIKzt9yDexeBng== X-Received: by 10.28.20.77 with SMTP id 74mr44266345wmu.1.1469468316657; Mon, 25 Jul 2016 10:38:36 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 190sm20531746wmk.13.2016.07.25.10.38.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jul 2016 10:38:22 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 25 Jul 2016 18:32:10 +0100 Message-Id: <1469467954-3920-32-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 31/55] drm/i915: Amalgamate GGTT/ppGTT vma debug list walkers 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 we can now have multiple VMA inside the global GTT (with partial mappings, rotations, etc), it is no longer true that there may just be a single GGTT entry and so we should walk the full vma_list to count up the actual usage. In addition to unifying the two walkers, switch from multiplying the object size for each vma to summing the bound vma sizes. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_debugfs.c | 46 +++++++++++++++---------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index dccc72d63dd0..e9ff1ec19e61 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -335,6 +335,7 @@ static int per_file_stats(int id, void *ptr, void *data) struct drm_i915_gem_object *obj = ptr; struct file_stats *stats = data; struct i915_vma *vma; + int bound = 0; stats->count++; stats->total += obj->base.size; @@ -342,41 +343,30 @@ static int per_file_stats(int id, void *ptr, void *data) if (obj->base.name || obj->base.dma_buf) stats->shared += obj->base.size; - if (USES_FULL_PPGTT(obj->base.dev)) { - list_for_each_entry(vma, &obj->vma_list, obj_link) { - struct i915_hw_ppgtt *ppgtt; + list_for_each_entry(vma, &obj->vma_list, obj_link) { + if (!drm_mm_node_allocated(&vma->node)) + continue; - if (!drm_mm_node_allocated(&vma->node)) - continue; + bound++; - if (vma->is_ggtt) { - stats->global += obj->base.size; - continue; - } - - ppgtt = container_of(vma->vm, struct i915_hw_ppgtt, base); + if (vma->is_ggtt) { + stats->global += vma->node.size; + } else { + struct i915_hw_ppgtt *ppgtt + = container_of(vma->vm, + struct i915_hw_ppgtt, + base); if (ppgtt->file_priv != stats->file_priv) continue; - - if (obj->active) /* XXX per-vma statistic */ - stats->active += obj->base.size; - else - stats->inactive += obj->base.size; - - return 0; - } - } else { - if (i915_gem_obj_ggtt_bound(obj)) { - stats->global += obj->base.size; - if (obj->active) - stats->active += obj->base.size; - else - stats->inactive += obj->base.size; - return 0; } + + if (obj->active) /* XXX per-vma statistic */ + stats->active += vma->node.size; + else + stats->inactive += vma->node.size; } - if (!list_empty(&obj->global_list)) + if (!bound) stats->unbound += obj->base.size; return 0;