From patchwork Mon Aug 15 09:48:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9280695 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 2788660839 for ; Mon, 15 Aug 2016 09:49:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 171E128D25 for ; Mon, 15 Aug 2016 09:49:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C21828D35; Mon, 15 Aug 2016 09:49:28 +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 AFABA28D25 for ; Mon, 15 Aug 2016 09:49:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 395346E3D0; Mon, 15 Aug 2016 09:49:27 +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 13D686E3CA for ; Mon, 15 Aug 2016 09:49:22 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id i5so10218764wmg.2 for ; Mon, 15 Aug 2016 02:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=jrBkNriZQRVW/lFIa8eS9Uxd4aOml1uZtqrj1yDRc40=; b=ccSYK7bIn6uGR9Wsk4fDU2yhUoUnBx6ZjhvidXCHWo+uc7TGQRLxzecmnFMDgJK6oa 1BmlxcH26V36mJ6ZoycPl35PVurMcN7pKHVpQdzZt8hZFFwEv95EqXs/2S+WfNVqa8uN 2h6whY5JGvL8CkuoFomEFD1yyDCV8WruJjneRCJ5PRwtPsG+QonLVZRegnFQBXL6W195 MAeUjtSE39rSw8zGYsJx7i14A6I+CLnPFEQByaE94UplQO9INuUOagJKRvo5mh6wxnQ7 MVSInWGrn4Q2Ic6DwsGVcYL0MTa2Etk9Wx/9eM1iLixyqiq073j19rz4GLro9Yp9dAOL fZ8Q== 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:subject:date:message-id :in-reply-to:references; bh=jrBkNriZQRVW/lFIa8eS9Uxd4aOml1uZtqrj1yDRc40=; b=WlKN1wgZcfZndNniGHl8aQrMNUcwm/0AOawwY2sPc/lZoyT+oURJ4hMytRhmKIEHGK nrCq0o6ei7J3qzmEMDg8ubkWE3Suh2SDHDiZJjBvzF4jg62GPxreLzmWxtgclvCq1yIB Z/u1I3LW55egTDpHbFBYgmG/IsIoApuKI+/NnegfhQkUuz02ICBr6oaSHE9FNaj1FI2B Zj8egBRmBEMgPWqPCbX0Ym97y6AqmX3TqggKQm+nXLE5tQHfPlBJ733cBlwTlv9EGKxQ N+Z6cvLHOluBkgm0cu4KkcWNoYN1++mdG+4kRa/22LscI4ublwlEnwrZznls+CZuHnDw C8Aw== X-Gm-Message-State: AEkoouuXP0h4ENhY8OnkPtXqL6sMKt1QFbkf4ElGV3Hbw+PstIksPR+r7jCtAU9kT+TR9g== X-Received: by 10.28.126.75 with SMTP id z72mr13368833wmc.74.1471254560486; Mon, 15 Aug 2016 02:49:20 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id v203sm15675247wmv.2.2016.08.15.02.49.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Aug 2016 02:49:19 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 15 Aug 2016 10:48:43 +0100 Message-Id: <1471254551-25805-4-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1471254551-25805-1-git-send-email-chris@chris-wilson.co.uk> References: <1471254551-25805-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 04/32] drm/i915: Remove inactive/active list from debugfs 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 These two files (i915_gem_active, i915_gem_inactive) no longer give pertinent information since active/inactive tracking is per-vm and so we need the information per-vm. They are obsolete so remove them. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_debugfs.c | 49 ------------------------------------- 1 file changed, 49 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index b8ed8db9f7ec..cf35ce0b8518 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -210,53 +210,6 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) seq_printf(m, " (frontbuffer: 0x%03x)", frontbuffer_bits); } -static int i915_gem_object_list_info(struct seq_file *m, void *data) -{ - struct drm_info_node *node = m->private; - uintptr_t list = (uintptr_t) node->info_ent->data; - struct list_head *head; - struct drm_device *dev = node->minor->dev; - struct drm_i915_private *dev_priv = to_i915(dev); - struct i915_ggtt *ggtt = &dev_priv->ggtt; - struct i915_vma *vma; - u64 total_obj_size, total_gtt_size; - int count, ret; - - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - return ret; - - /* FIXME: the user of this interface might want more than just GGTT */ - switch (list) { - case ACTIVE_LIST: - seq_puts(m, "Active:\n"); - head = &ggtt->base.active_list; - break; - case INACTIVE_LIST: - seq_puts(m, "Inactive:\n"); - head = &ggtt->base.inactive_list; - break; - default: - mutex_unlock(&dev->struct_mutex); - return -EINVAL; - } - - total_obj_size = total_gtt_size = count = 0; - list_for_each_entry(vma, head, vm_link) { - seq_printf(m, " "); - describe_obj(m, vma->obj); - seq_printf(m, "\n"); - total_obj_size += vma->obj->base.size; - total_gtt_size += vma->node.size; - count++; - } - mutex_unlock(&dev->struct_mutex); - - seq_printf(m, "Total %d objects, %llu bytes, %llu GTT size\n", - count, total_obj_size, total_gtt_size); - return 0; -} - static int obj_rank_by_stolen(void *priv, struct list_head *A, struct list_head *B) { @@ -5429,8 +5382,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_objects", i915_gem_object_info, 0}, {"i915_gem_gtt", i915_gem_gtt_info, 0}, {"i915_gem_pinned", i915_gem_gtt_info, 0, (void *) PINNED_LIST}, - {"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST}, - {"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST}, {"i915_gem_stolen", i915_gem_stolen_list_info }, {"i915_gem_pageflip", i915_gem_pageflip_info, 0}, {"i915_gem_request", i915_gem_request_info, 0},